commit debe27335e10d06aa16a5ac2148fe8a74675ca2c
Author: Tomas Mraz <tmraz(a)fedoraproject.org>
Date: Wed Aug 13 15:01:32 2014 +0200
pam_tally2: Avoid uninitialized use of fileinfo.
Problem found by Robin Hack <rhack(a)redhat.com>.
modules/pam_tally2/pam_tally2.c (get_tally): Do not depend on file size
just try to read it.
modules/pam_tally2/pam_tally2.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/modules/pam_tally2/pam_tally2.c b/modules/pam_tally2/pam_tally2.c
index 09e8585..f5eebb1 100644
--- a/modules/pam_tally2/pam_tally2.c
+++ b/modules/pam_tally2/pam_tally2.c
@@ -451,11 +451,8 @@ skip_open:
alarm(oldalarm);
}
- if (fileinfo.st_size < (off_t)(uid+1)*(off_t)sizeof(*tally)) {
+ if (pam_modutil_read(*tfile, void_tally, sizeof(*tally)) != sizeof(*tally)) {
memset(tally, 0, sizeof(*tally));
- } else if (pam_modutil_read(*tfile, void_tally, sizeof(*tally)) != sizeof(*tally)) {
- memset(tally, 0, sizeof(*tally));
- /* Shouldn't happen */
}
tally->fail_line[sizeof(tally->fail_line)-1] = '\0';