Relevant BUGIDs:

Purpose of commit:

Commit summary:
---------------

bugfix: Add rest of Steve Grubb's resource leak and other fixes

1 files changed, 22 insertions, 13 deletions

diff --git a/modules/pam_nologin/pam_nologin.c b/modules/pam_nologin/pam_nologin.c
index 6916a7b4..433d2e11 100644
--- a/modules/pam_nologin/pam_nologin.c
+++ b/modules/pam_nologin/pam_nologin.c
@@ -117,22 +117,31 @@ static int perform_check(pam_handle_t *pamh, struct opt_s *opts)
 	    goto clean_up_fd;
 	}
 
-	read(fd, mtmp, st.st_size);
-	mtmp[st.st_size] = '\000';
-
-	/*
-	 * Use conversation function to give user contents of /etc/nologin
-	 */
+	if (_pammodutil_read(fd, mtmp, st.st_size) == st.st_size) {
+		mtmp[st.st_size] = '\000';
+
+		/*
+		 * Use conversation function to give user contents 
+		 * of /etc/nologin
+		 */
+
+		retval = pam_get_item(pamh, PAM_CONV, 
+				(const void **)&conversation);
+		if ((retval == PAM_SUCCESS) && (conversation)) {
+			(void) conversation->conv(1, 
+				(const struct pam_message **)&pmessage,
+				&resp, conversation->appdata_ptr);
+
+			if (resp) {
+			    _pam_drop_reply(resp, 1);
+			}
+		}
+	}
+	else
+	    retval = PAM_SYSTEM_ERR;
 
-	pam_get_item(pamh, PAM_CONV, (const void **)&conversation);
-	(void) conversation->conv(1, (const struct pam_message **)&pmessage,
-				  &resp, conversation->appdata_ptr);
 	free(mtmp);
 
-	if (resp) {
-	    _pam_drop_reply(resp, 1);
-	}
-
     clean_up_fd:
 
 	close(fd);