summaryrefslogtreecommitdiff
path: root/usr/src/lib/libdevinfo/devinfo_devperm.c
diff options
context:
space:
mode:
authorGary Mills <mills@cc.umanitoba.ca>2011-05-31 16:11:17 -0500
committerGary Mills <mills@cc.umanitoba.ca>2011-05-31 16:11:17 -0500
commit353d0ed92f217f4451141e1efb06f10aa1a0f1a7 (patch)
tree79595506ee508ebc069723c911f24bf2d8298f16 /usr/src/lib/libdevinfo/devinfo_devperm.c
parentc9ba2a43cb76c223d115e021fdabd2c066e020ed (diff)
downloadillumos-joyent-353d0ed92f217f4451141e1efb06f10aa1a0f1a7.tar.gz
1052 ttymon crashes in a loop when non-existent user logs out
Reviewed by: Gordon Ross <gwr@nexenta.com> Reviewed by: Garrett D'Amore <garrett@nexenta.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/libdevinfo/devinfo_devperm.c')
-rw-r--r--usr/src/lib/libdevinfo/devinfo_devperm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/lib/libdevinfo/devinfo_devperm.c b/usr/src/lib/libdevinfo/devinfo_devperm.c
index 9ac679e2a0..b335150f97 100644
--- a/usr/src/lib/libdevinfo/devinfo_devperm.c
+++ b/usr/src/lib/libdevinfo/devinfo_devperm.c
@@ -19,6 +19,8 @@
* CDDL HEADER END
*/
/*
+ * Copyright (c) 2011 Gary Mills
+ *
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/
@@ -394,7 +396,8 @@ is_login_user(uid_t uid)
char pwd_buf[NSS_BUFLEN_PASSWD];
struct utmpx *utx;
- if ((getpwuid_r(uid, &pwd, pwd_buf, NSS_BUFLEN_PASSWD, &ppwd))) {
+ if ((getpwuid_r(uid, &pwd, pwd_buf, NSS_BUFLEN_PASSWD, &ppwd) != 0) ||
+ (ppwd == NULL)) {
return (0);
}