emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/lastlog.c, src/faillog.c: Fix underflows causing wrong entry

Browse Source 
to be displayed.
This commit is contained in:
nekral-guest 2011-06-02 20:26:30 +00:00
parent f406d16b7b
commit 597bb764f1
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-06-02 Peter Vrabec <pvrabec@redhat.com>
* src/lastlog.c, src/faillog.c: Fix underflows causing wrong entry
to be displayed.
2011-06-02 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/xmalloc.c: Harmonize message.

12
src/faillog.c
View File

@ -118,8 +118,8 @@ static void print_one (/*@null@*/const struct passwd *pw, bool force)
return;
}
offset = pw->pw_uid * sizeof (fl);
if (offset <= (statbuf.st_size - sizeof (fl))) {
offset = (off_t) pw->pw_uid * sizeof (fl);
if (offset + sizeof (fl) <= statbuf.st_size) {
/* fseeko errors are not really relevant for us. */
int err = fseeko (fail, offset, SEEK_SET);
assert (0 == err);
@ -218,8 +218,8 @@ static bool reset_one (uid_t uid)
off_t offset;
struct faillog fl;
offset = uid * sizeof (fl);
if (offset <= (statbuf.st_size - sizeof (fl))) {
offset = (off_t) uid * sizeof (fl);
if (offset + sizeof (fl) <= statbuf.st_size) {
/* fseeko errors are not really relevant for us. */
int err = fseeko (fail, offset, SEEK_SET);
assert (0 == err);
@ -333,7 +333,7 @@ static bool setmax_one (uid_t uid, int max)
struct faillog fl;
offset = (off_t) uid * sizeof (fl);
if (offset <= (statbuf.st_size - sizeof (fl))) {
if (offset + sizeof (fl) <= statbuf.st_size) {
/* fseeko errors are not really relevant for us. */
int err = fseeko (fail, offset, SEEK_SET);
assert (0 == err);
@ -450,7 +450,7 @@ static bool set_locktime_one (uid_t uid, long locktime)
struct faillog fl;
offset = (off_t) uid * sizeof (fl);
if (offset <= (statbuf.st_size - sizeof (fl))) {
if (offset + sizeof (fl) <= statbuf.st_size) {
/* fseeko errors are not really relevant for us. */
int err = fseeko (fail, offset, SEEK_SET);
assert (0 == err);

5
src/lastlog.c
View File

@ -102,9 +102,8 @@ static void print_one (/*@null@*/const struct passwd *pw)
}
offset = pw->pw_uid * sizeof (ll);
if (offset <= (statbuf.st_size - sizeof (ll))) {
offset = (off_t) pw->pw_uid * sizeof (ll);
if (offset + sizeof (ll) <= statbuf.st_size) {
/* fseeko errors are not really relevant for us. */
int err = fseeko (lastlogfile, offset, SEEK_SET);
assert (0 == err);