14380 pam_modules: build errors with gcc 11

Reviewed by: Andy Fiddaman <illumos@fiddaman.net> Reviewed by: Klaus Ziegler <klausz@haus-gisela.de> Approved by: Dan McDonald <danmcd@mnx.io>
illumos · May 22, 2023 · 040524e · 040524e
1 parent c0524ac
commit 040524e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/usr/src/lib/libpam/pam_framework.c b/usr/src/lib/libpam/pam_framework.c
@@ -103,7 +103,7 @@ static void	free_env(env_list *);
 
 static void	free_resp(int, struct pam_response *);
 static int	do_conv(pam_handle_t *, int, int,
-    char messages[PAM_MAX_NUM_MSG][PAM_MAX_MSG_SIZE], void *,
+    char messages[][PAM_MAX_MSG_SIZE], void *,
     struct pam_response **);
 
 static int	log_priority;	/* pam_trace syslog priority & facility */
@@ -2643,7 +2643,7 @@ free_resp(int num_msg, struct pam_response *resp)
 
 static int
 do_conv(pam_handle_t *pamh, int msg_style, int num_msg,
-    char messages[PAM_MAX_NUM_MSG][PAM_MAX_MSG_SIZE], void *conv_apdp,
+    char messages[][PAM_MAX_MSG_SIZE], void *conv_apdp,
     struct pam_response *ret_respp[])
 {
 	struct pam_message	*msg;
@@ -2757,13 +2757,16 @@ do_conv(pam_handle_t *pamh, int msg_style, int num_msg,
 
 int
 __pam_display_msg(pam_handle_t *pamh, int msg_style, int num_msg,
-    char messages[PAM_MAX_NUM_MSG][PAM_MAX_MSG_SIZE], void *conv_apdp)
+    char messages[][PAM_MAX_MSG_SIZE], void *conv_apdp)
 {
 	struct pam_response	*ret_respp = NULL;
 	int ret;
 
-	ret = do_conv(pamh, msg_style, num_msg, messages,
-	    conv_apdp, &ret_respp);
+	if (num_msg <= 0 || num_msg > PAM_MAX_NUM_MSG)
+		ret = PAM_CONV_ERR;
+	else
+		ret = do_conv(pamh, msg_style, num_msg, messages,
+		    conv_apdp, &ret_respp);
 
 	if (ret_respp != NULL)
 		free_resp(num_msg, ret_respp);

diff --git a/usr/src/lib/libpam/pam_impl.h b/usr/src/lib/libpam/pam_impl.h
@@ -146,7 +146,7 @@ __pam_get_authtok(pam_handle_t *pamh, int source, int type, char *prompt,
 
 extern int
 __pam_display_msg(pam_handle_t *pamh, int msg_style, int num_msg,
-    char messages[PAM_MAX_NUM_MSG][PAM_MAX_MSG_SIZE], void *conv_apdp);
+    char messages[][PAM_MAX_MSG_SIZE], void *conv_apdp);
 
 extern void
 __pam_log(int priority, const char *format, ...);