rpms/pam/devel pam-0.79-tally-null-data.patch, NONE, 1.1 pam.spec, 1.64, 1.65

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17787

Modified Files:
	pam.spec 
Added Files:
	pam-0.79-tally-null-data.patch 
Log Message:
* Sun Apr  3 2005 Tomas Mraz <tmraz at redhat.com> 0.79-2
- fix NULL deref in pam_tally when it's used in account phase


pam-0.79-tally-null-data.patch:
 pam_tally.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pam-0.79-tally-null-data.patch ---
--- Linux-PAM-0.79/modules/pam_tally/pam_tally.c.null-data	2005-01-31 13:37:04.000000000 +0100
+++ Linux-PAM-0.79/modules/pam_tally/pam_tally.c	2005-04-03 19:03:14.576315606 +0200
@@ -268,7 +268,7 @@
     const void *data;
 
     rv = pam_get_data(pamh, MODULE_NAME, &data);
-    if ( rv == PAM_SUCCESS && oldtime != NULL ) {
+    if ( rv == PAM_SUCCESS && data != NULL && oldtime != NULL ) {
       *oldtime = *(const time_t *)data;
       pam_set_data(pamh, MODULE_NAME, NULL, NULL);
     }


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- pam.spec	31 Mar 2005 17:15:12 -0000	1.64
+++ pam.spec	3 Apr 2005 17:12:42 -0000	1.65
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.79
-Release: 1
+Release: 2
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 Patch34: pam-0.77-dbpam.patch
 Patch60: pam-0.78-selinux.patch
 Patch61: pam-pwdbselinux.patch
+Patch70: pam-0.79-tally-null-data.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8, glib2, initscripts >= 3.94
@@ -78,6 +79,7 @@
 %if %{WITH_SELINUX}
 %patch60 -p1 -b .selinux
 %patch61 -p1 -b .pwdbselinux 
+%patch70 -p1 -b .null-data
 %endif
 
 for readme in modules/pam_*/README ; do
@@ -346,6 +348,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Sun Apr  3 2005 Tomas Mraz <tmraz at redhat.com> 0.79-2
+- fix NULL deref in pam_tally when it's used in account phase
+
 * Thu Mar 31 2005 Tomas Mraz <tmraz at redhat.com> 0.79-1
 - upgrade to the new upstream release
 - moved pam_loginuid to pam-redhat repository