Module Name: src
Committed By: fox
Date: Fri Jun 12 01:20:32 UTC 2020
Modified Files:
src/lib/libpam/modules/pam_krb5: pam_krb5.c
Log Message:
lib/libpam: Fix the possible -Werror=stringop-truncation
Replace strncpy(3) with the safer strlcpy(3) and adjust the code.
Error was reported when build.sh was run with MKLIBCSANITIZER=yes flag.
Reviewed by: kamil@, christos@
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libpam/modules/pam_krb5/pam_krb5.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_krb5/pam_krb5.c
diff -u src/lib/libpam/modules/pam_krb5/pam_krb5.c:1.28 src/lib/libpam/modules/pam_krb5/pam_krb5.c:1.29
--- src/lib/libpam/modules/pam_krb5/pam_krb5.c:1.28 Fri Feb 7 23:28:59 2020
+++ src/lib/libpam/modules/pam_krb5/pam_krb5.c Fri Jun 12 01:20:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_krb5.c,v 1.28 2020/02/07 23:28:59 christos Exp $ */
+/* $NetBSD: pam_krb5.c,v 1.29 2020/06/12 01:20:32 fox Exp $ */
/*-
* This pam_krb5 module contains code that is:
@@ -53,7 +53,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.22 2005/01/24 16:49:50 rwatson Exp $");
#else
-__RCSID("$NetBSD: pam_krb5.c,v 1.28 2020/02/07 23:28:59 christos Exp $");
+__RCSID("$NetBSD: pam_krb5.c,v 1.29 2020/06/12 01:20:32 fox Exp $");
#endif
#include <sys/types.h>
@@ -945,9 +945,8 @@ verify_krb_v5_tgt(krb5_context context,
return -1;
/* Extract the name directly. */
- strncpy(phost, compat_princ_component(context, princ, 1),
- BUFSIZ);
- phost[BUFSIZ - 1] = '\0';
+ strlcpy(phost, compat_princ_component(context, princ, 1),
+ sizeof(phost));
/*
* Do we have service/<host> keys?
