aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvorlon <Unknown>2005-10-24 06:23:51 +0000
committervorlon <Unknown>2005-10-24 06:23:51 +0000
commitdddf3b02d3c2fd22442f38fbb9546aaec7d33625 (patch)
treecb48ec9b10b6620fe48de6bafcb031a2159f011e
parent1ccfda0bb24dab7eadfb7d91fda687909eb7a8f6 (diff)
downloadpam-dddf3b02d3c2fd22442f38fbb9546aaec7d33625.tar.gz
pam-dddf3b02d3c2fd22442f38fbb9546aaec7d33625.tar.bz2
pam-dddf3b02d3c2fd22442f38fbb9546aaec7d33625.zip
Fix a segfault in pam_tally caused by misuse of pam_get_data(); already
fixed upstream. Closes: #335273.
-rw-r--r--changelog4
-rw-r--r--patches-applied/060_pam_tally_segv13
2 files changed, 16 insertions, 1 deletions
diff --git a/changelog b/changelog
index 6dab17d6..c8d31ef8 100644
--- a/changelog
+++ b/changelog
@@ -9,8 +9,10 @@ pam (0.79-4) UNRELEASED; urgency=low
* Fix the formatting of the libpam-cracklib package description.
* Patch 010: remove parts of the patch that aren't necessary for C++
compatibility.
+ * Patch 060: fix a segfault in pam_tally caused by misuse of
+ pam_get_data(); already fixed upstream. Closes: #335273.
- -- Steve Langasek <vorlon@debian.org> Mon, 3 Oct 2005 01:57:54 -0700
+ -- Steve Langasek <vorlon@debian.org> Sun, 23 Oct 2005 23:17:24 -0700
pam (0.79-3) unstable; urgency=low
diff --git a/patches-applied/060_pam_tally_segv b/patches-applied/060_pam_tally_segv
new file mode 100644
index 00000000..13347468
--- /dev/null
+++ b/patches-applied/060_pam_tally_segv
@@ -0,0 +1,13 @@
+Index: Linux-PAM/modules/pam_tally/pam_tally.c
+===================================================================
+--- Linux-PAM/modules/pam_tally/pam_tally.c (revision 363)
++++ Linux-PAM/modules/pam_tally/pam_tally.c (working copy)
+@@ -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);
+ }