* [PATCH] last: make session gone determination more robust
@ 2014-01-21 22:05 Sami Kerola
2014-02-10 17:26 ` Karel Zak
0 siblings, 1 reply; 2+ messages in thread
From: Sami Kerola @ 2014-01-21 22:05 UTC (permalink / raw)
To: util-linux; +Cc: kerolasa
Earlier determination that used kill with signal zero to pid was prone to
false positive reports, due reuse of pid space and unrelated processes.
New function is_phantom() tries do a little bit better job, but fails to
be perfect. It seems linking to gether utmp session start time or
terminal id with /proc/<pid>/ information is not as simple as one might
hope.
Reported-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
login-utils/last.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/login-utils/last.c b/login-utils/last.c
index 5550dcb..e4a8497 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <ctype.h>
#include <utmp.h>
+#include <pwd.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
@@ -572,6 +573,26 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
}
+static int is_phantom(struct utmp *ut)
+{
+ struct passwd *pw;
+ char path[32];
+ FILE *f;
+ unsigned int loginuid, ret = 0;
+
+ pw = getpwnam(ut->ut_name);
+ if (!pw)
+ return 1;
+ sprintf(path, "/proc/%u/loginuid", ut->ut_pid);
+ if (!(f = fopen(path, "r")))
+ return 1;
+ if (fscanf(f, "%u", &loginuid) != 1)
+ ret = 1;
+ fclose(f);
+ if (!ret && pw->pw_uid != loginuid)
+ return 1;
+ return ret;
+}
static void process_wtmp_file(const struct last_control *ctl)
{
@@ -766,9 +787,7 @@ static void process_wtmp_file(const struct last_control *ctl)
if (!lastboot) {
c = R_NOW;
/* Is process still alive? */
- if (ut.ut_pid > 0 &&
- kill(ut.ut_pid, 0) != 0 &&
- errno == ESRCH)
+ if (is_phantom(&ut))
c = R_PHANTOM;
} else
c = whydown;
--
1.8.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] last: make session gone determination more robust
2014-01-21 22:05 [PATCH] last: make session gone determination more robust Sami Kerola
@ 2014-02-10 17:26 ` Karel Zak
0 siblings, 0 replies; 2+ messages in thread
From: Karel Zak @ 2014-02-10 17:26 UTC (permalink / raw)
To: Sami Kerola; +Cc: util-linux
On Tue, Jan 21, 2014 at 10:05:05PM +0000, Sami Kerola wrote:
> login-utils/last.c | 25 ++++++++++++++++++++++---
> 1 file changed, 22 insertions(+), 3 deletions(-)
No perfect, but better than the previous version.
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-10 17:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-21 22:05 [PATCH] last: make session gone determination more robust Sami Kerola
2014-02-10 17:26 ` Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox