Xinqi Bao's Git

projects / slock.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
fix CVE-2016-6866
[slock.git] / slock.c
diff --git a/slock.c b/slock.c
index 320ed2b..8ed59ca 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <X11/extensions/Xrandr.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -22,53 +23,95 @@
 #include <bsd_auth.h>
 #endif
 
 #include <bsd_auth.h>
 #endif
 
+#include "arg.h"
+#include "util.h"
+
+char *argv0;
+
+enum {
+       INIT,
+       INPUT,
+       FAILED,
+       NUMCOLS
+};
+
+#include "config.h"
+
 typedef struct {
        int screen;
        Window root, win;
        Pixmap pmap;
 typedef struct {
        int screen;
        Window root, win;
        Pixmap pmap;
-       unsigned long colors[2];
+       unsigned long colors[NUMCOLS];
 } Lock;
 
 static Lock **locks;
 static int nscreens;
 static Bool running = True;
 } Lock;
 
 static Lock **locks;
 static int nscreens;
 static Bool running = True;
+static Bool failure = False;
+static Bool rr;
+static int rrevbase;
+static int rrerrbase;
 
 static void
 
 static void
-die(const char *errstr, ...) {
+die(const char *errstr, ...)
+{
        va_list ap;
 
        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
        va_end(ap);
        va_list ap;
 
        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
        va_end(ap);
-       exit(EXIT_FAILURE);
+       exit(1);
+}
+
+#ifdef __linux__
+#include <fcntl.h>
+
+static void
+dontkillme(void)
+{
+       int fd;
+
+       fd = open("/proc/self/oom_score_adj", O_WRONLY);
+       if (fd < 0 && errno == ENOENT) {
+               return;
+       }
+       if (fd < 0 || write(fd, "-1000\n", (sizeof("-1000\n") - 1)) !=
+           (sizeof("-1000\n") - 1) || close(fd) != 0) {
+               die("can't tame the oom-killer. is suid or sgid set?\n");
+       }
 }
 }
+#endif
 
 #ifndef HAVE_BSD_AUTH
 
 #ifndef HAVE_BSD_AUTH
+/* only run as root */
 static const char *
 static const char *
-getpw(void) { /* only run as root */
+getpw(void)
+{
        const char *rval;
        struct passwd *pw;
 
        const char *rval;
        struct passwd *pw;
 
-       pw = getpwuid(getuid());
-       if(!pw)
-               die("slock: cannot retrieve password entry (make sure to suid or sgid slock)");
-       endpwent();
-       rval =  pw->pw_passwd;
+       errno = 0;
+       if (!(pw = getpwuid(getuid()))) {
+               if (errno)
+                       die("getpwuid: %s\n", strerror(errno));
+               else
+                       die("cannot retrieve password entry\n");
+       }
+       rval = pw->pw_passwd;
 
 #if HAVE_SHADOW_H
 
 #if HAVE_SHADOW_H
-       if (strlen(rval) >= 1) { /* kludge, assumes pw placeholder entry has len >= 1 */
+       if (rval[0] == 'x' && rval[1] == '\0') {
                struct spwd *sp;
                struct spwd *sp;
-               sp = getspnam(getenv("USER"));
-               if(!sp)
-                       die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
-               endspent();
+               if (!(sp = getspnam(getenv("USER"))))
+                       die("cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
                rval = sp->sp_pwdp;
        }
 #endif
 
        /* drop privileges */
                rval = sp->sp_pwdp;
        }
 #endif
 
        /* drop privileges */
-       if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
-               die("slock: cannot drop privileges");
+       if (geteuid() == 0 &&
+           ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
+               die("cannot drop privileges\n");
        return rval;
 }
 #endif
        return rval;
 }
 #endif
@@ -80,84 +123,99 @@ readpw(Display *dpy)
 readpw(Display *dpy, const char *pws)
 #endif
 {
 readpw(Display *dpy, const char *pws)
 #endif
 {
-       char buf[32], passwd[256];
+       char buf[32], passwd[256], *encrypted;
        int num, screen;
        int num, screen;
-       unsigned int len, llen;
+       unsigned int len, color;
        KeySym ksym;
        XEvent ev;
        KeySym ksym;
        XEvent ev;
+       static int oldc = INIT;
 
 
-       len = llen = 0;
+       len = 0;
        running = True;
 
        /* As "slock" stands for "Simple X display locker", the DPMS settings
         * had been removed and you can set it with "xset" or some other
         * utility. This way the user can easily set a customized DPMS
         * timeout. */
        running = True;
 
        /* As "slock" stands for "Simple X display locker", the DPMS settings
         * had been removed and you can set it with "xset" or some other
         * utility. This way the user can easily set a customized DPMS
         * timeout. */
-       while(running && !XNextEvent(dpy, &ev)) {
-               if(ev.type == KeyPress) {
-                       buf[0] = 0;
-                       num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
-                       if(IsKeypadKey(ksym)) {
-                               if(ksym == XK_KP_Enter)
+       while (running && !XNextEvent(dpy, &ev)) {
+               if (ev.type == KeyPress) {
+                       explicit_bzero(&buf, sizeof(buf));
+                       num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
+                       if (IsKeypadKey(ksym)) {
+                               if (ksym == XK_KP_Enter)
                                        ksym = XK_Return;
                                        ksym = XK_Return;
-                               else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
+                               else if (ksym >= XK_KP_0 && ksym <= XK_KP_9)
                                        ksym = (ksym - XK_KP_0) + XK_0;
                        }
                                        ksym = (ksym - XK_KP_0) + XK_0;
                        }
-                       if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-                                       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-                                       || IsPrivateKeypadKey(ksym))
+                       if (IsFunctionKey(ksym) ||
+                           IsKeypadKey(ksym) ||
+                           IsMiscFunctionKey(ksym) ||
+                           IsPFKey(ksym) ||
+                           IsPrivateKeypadKey(ksym))
                                continue;
                                continue;
-                       switch(ksym) {
+                       switch (ksym) {
                        case XK_Return:
                                passwd[len] = 0;
 #ifdef HAVE_BSD_AUTH
                        case XK_Return:
                                passwd[len] = 0;
 #ifdef HAVE_BSD_AUTH
-                               running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
+                               running = !auth_userokay(getlogin(), NULL, "auth-slock", passwd);
 #else
 #else
-                               running = strcmp(crypt(passwd, pws), pws);
+                               errno = 0;
+                               if (!(encrypted = crypt(passwd, pws)))
+                                       fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
+                               else
+                                       running = !!strcmp(encrypted, pws);
 #endif
 #endif
-                               if(running != False)
+                               if (running) {
                                        XBell(dpy, 100);
                                        XBell(dpy, 100);
+                                       failure = True;
+                               }
+                               explicit_bzero(&passwd, sizeof(passwd));
                                len = 0;
                                break;
                        case XK_Escape:
                                len = 0;
                                break;
                        case XK_Escape:
+                               explicit_bzero(&passwd, sizeof(passwd));
                                len = 0;
                                break;
                        case XK_BackSpace:
                                len = 0;
                                break;
                        case XK_BackSpace:
-                               if(len)
-                                       --len;
+                               if (len)
+                                       passwd[len--] = 0;
                                break;
                        default:
                                break;
                        default:
-                               if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { 
+                               if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) {
                                        memcpy(passwd + len, buf, num);
                                        len += num;
                                }
                                break;
                        }
                                        memcpy(passwd + len, buf, num);
                                        len += num;
                                }
                                break;
                        }
-                       if(llen == 0 && len != 0) {
-                               for(screen = 0; screen < nscreens; screen++) {
-                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[1]);
+                       color = len ? INPUT : (failure || failonclear ? FAILED : INIT);
+                       if (running && oldc != color) {
+                               for (screen = 0; screen < nscreens; screen++) {
+                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
                                        XClearWindow(dpy, locks[screen]->win);
                                }
                                        XClearWindow(dpy, locks[screen]->win);
                                }
-                       } else if(llen != 0 && len == 0) {
-                               for(screen = 0; screen < nscreens; screen++) {
-                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
+                               oldc = color;
+                       }
+               } else if (rr && ev.type == rrevbase + RRScreenChangeNotify) {
+                       XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev;
+                       for (screen = 0; screen < nscreens; screen++) {
+                               if (locks[screen]->win == rre->window) {
+                                       XResizeWindow(dpy, locks[screen]->win, rre->width, rre->height);
                                        XClearWindow(dpy, locks[screen]->win);
                                }
                        }
                                        XClearWindow(dpy, locks[screen]->win);
                                }
                        }
-                       llen = len;
-               }
-               else for(screen = 0; screen < nscreens; screen++)
+               } else for (screen = 0; screen < nscreens; screen++)
                        XRaiseWindow(dpy, locks[screen]->win);
        }
 }
 
 static void
                        XRaiseWindow(dpy, locks[screen]->win);
        }
 }
 
 static void
-unlockscreen(Display *dpy, Lock *lock) {
+unlockscreen(Display *dpy, Lock *lock)
+{
        if(dpy == NULL || lock == NULL)
                return;
 
        XUngrabPointer(dpy, CurrentTime);
        if(dpy == NULL || lock == NULL)
                return;
 
        XUngrabPointer(dpy, CurrentTime);
-       XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0);
+       XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, NUMCOLS, 0);
        XFreePixmap(dpy, lock->pmap);
        XDestroyWindow(dpy, lock->win);
 
        XFreePixmap(dpy, lock->pmap);
        XDestroyWindow(dpy, lock->win);
 
@@ -165,69 +223,66 @@ unlockscreen(Display *dpy, Lock *lock) {
 }
 
 static Lock *
 }
 
 static Lock *
-lockscreen(Display *dpy, int screen) {
+lockscreen(Display *dpy, int screen)
+{
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
-       unsigned int len;
+       int i;
        Lock *lock;
        XColor color, dummy;
        XSetWindowAttributes wa;
        Cursor invisible;
 
        Lock *lock;
        XColor color, dummy;
        XSetWindowAttributes wa;
        Cursor invisible;
 
-       if(dpy == NULL || screen < 0)
-               return NULL;
-
-       lock = malloc(sizeof(Lock));
-       if(lock == NULL)
+       if (!running || dpy == NULL || screen < 0 || !(lock = malloc(sizeof(Lock))))
                return NULL;
 
        lock->screen = screen;
                return NULL;
 
        lock->screen = screen;
-
        lock->root = RootWindow(dpy, lock->screen);
 
        lock->root = RootWindow(dpy, lock->screen);
 
+       for (i = 0; i < NUMCOLS; i++) {
+               XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), colorname[i], &color, &dummy);
+               lock->colors[i] = color.pixel;
+       }
+
        /* init */
        wa.override_redirect = 1;
        /* init */
        wa.override_redirect = 1;
-       wa.background_pixel = BlackPixel(dpy, lock->screen);
+       wa.background_pixel = lock->colors[INIT];
        lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
        lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
-                       0, DefaultDepth(dpy, lock->screen), CopyFromParent,
-                       DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
-       XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy);
-       lock->colors[1] = color.pixel;
-       XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy);
-       lock->colors[0] = color.pixel;
+                                 0, DefaultDepth(dpy, lock->screen), CopyFromParent,
+                                 DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
        lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
        invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0);
        XDefineCursor(dpy, lock->win, invisible);
        lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
        invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0);
        XDefineCursor(dpy, lock->win, invisible);
-       XMapRaised(dpy, lock->win);
-       for(len = 1000; len; len--) {
-               if(XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-                       GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
-                       break;
-               usleep(1000);
-       }
-       if(running && (len > 0)) {
-               for(len = 1000; len; len--) {
-                       if(XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-                               == GrabSuccess)
-                               break;
-                       usleep(1000);
-               }
-               running = (len > 0);
+
+       /* Try to grab mouse pointer *and* keyboard, else fail the lock */
+       if (XGrabPointer(dpy, lock->root, False, ButtonPressMask |
+           ButtonReleaseMask | PointerMotionMask, GrabModeAsync, GrabModeAsync,
+           None, invisible, CurrentTime) != GrabSuccess) {
+               fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n", screen);
+               running = 0;
+               unlockscreen(dpy, lock);
+               return NULL;
        }
 
        }
 
-       if(!running) {
+       if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync,
+           CurrentTime) != GrabSuccess) {
+               fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", screen);
+               running = 0;
                unlockscreen(dpy, lock);
                unlockscreen(dpy, lock);
-               lock = NULL;
+               return NULL;
        }
        }
-       else 
-               XSelectInput(dpy, lock->root, SubstructureNotifyMask);
 
 
+       XMapRaised(dpy, lock->win);
+       if (rr)
+               XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
+
+       XSelectInput(dpy, lock->root, SubstructureNotifyMask);
        return lock;
 }
 
 static void
        return lock;
 }
 
 static void
-usage(void) {
-       fprintf(stderr, "usage: slock [-v]\n");
-       exit(EXIT_FAILURE);
+usage(void)
+{
+       die("usage: slock [-v | cmd [arg ...]]\n");
 }
 
 int
 }
 
 int
@@ -236,41 +291,88 @@ main(int argc, char **argv) {
        const char *pws;
 #endif
        Display *dpy;
        const char *pws;
 #endif
        Display *dpy;
-       int screen;
+       int s, nlocks;
 
 
-       if((argc == 2) && !strcmp("-v", argv[1]))
-               die("slock-%s, © 2006-2012 Anselm R Garbe\n", VERSION);
-       else if(argc != 1)
+       ARGBEGIN {
+       case 'v':
+               fprintf(stderr, "slock-"VERSION"\n");
+               return 0;
+       default:
                usage();
                usage();
+       } ARGEND
 
 
-       if(!getpwuid(getuid()))
-               die("slock: no passwd entry for you");
+#ifdef __linux__
+       dontkillme();
+#endif
+
+       /* Check if the current user has a password entry */
+       errno = 0;
+       if (!getpwuid(getuid())) {
+               if (errno == 0)
+                       die("slock: no password entry for current user\n");
+               else
+                       die("slock: getpwuid: %s\n", strerror(errno));
+       }
 
 #ifndef HAVE_BSD_AUTH
        pws = getpw();
 
 #ifndef HAVE_BSD_AUTH
        pws = getpw();
+       if (strlen(pws) < 2)
+               die("slock: failed to get user password hash.\n");
 #endif
 
 #endif
 
-       if(!(dpy = XOpenDisplay(0)))
-               die("slock: cannot open display");
-       /* Get the number of screens in display "dpy" and blank them all. */
+       if (!(dpy = XOpenDisplay(NULL)))
+               die("slock: cannot open display\n");
+
+       /* check for Xrandr support */
+       rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase);
+
+       /* get number of screens in display "dpy" and blank them */
        nscreens = ScreenCount(dpy);
        nscreens = ScreenCount(dpy);
-       locks = malloc(sizeof(Lock *) * nscreens);
-       if(locks == NULL)
-               die("slock: malloc: %s", strerror(errno));
-       for(screen = 0; screen < nscreens; screen++)
-               locks[screen] = lockscreen(dpy, screen);
-       XSync(dpy, False);
-
-       /* Everything is now blank. Now wait for the correct password. */
+       if (!(locks = malloc(sizeof(Lock *) * nscreens))) {
+               XCloseDisplay(dpy);
+               die("slock: out of memory\n");
+       }
+       for (nlocks = 0, s = 0; s < nscreens; s++) {
+               if ((locks[s] = lockscreen(dpy, s)) != NULL)
+                       nlocks++;
+       }
+       XSync(dpy, 0);
+
+       /* did we actually manage to lock anything? */
+       if (nlocks == 0) {
+               /* nothing to protect */
+               free(locks);
+               XCloseDisplay(dpy);
+               return 1;
+       }
+
+       /* run post-lock command */
+       if (argc > 0) {
+               switch (fork()) {
+               case -1:
+                       free(locks);
+                       XCloseDisplay(dpy);
+                       die("slock: fork failed: %s\n", strerror(errno));
+               case 0:
+                       if (close(ConnectionNumber(dpy)) < 0)
+                               die("slock: close: %s\n", strerror(errno));
+                       execvp(argv[0], argv);
+                       fprintf(stderr, "slock: execvp %s: %s\n", argv[0],
+                               strerror(errno));
+                       _exit(1);
+               }
+       }
+
+       /* everything is now blank. Wait for the correct password */
 #ifdef HAVE_BSD_AUTH
        readpw(dpy);
 #else
        readpw(dpy, pws);
 #endif
 
 #ifdef HAVE_BSD_AUTH
        readpw(dpy);
 #else
        readpw(dpy, pws);
 #endif
 
-       /* Password ok, unlock everything and quit. */
-       for(screen = 0; screen < nscreens; screen++)
-               unlockscreen(dpy, locks[screen]);
+       /* password ok, unlock everything and quit */
+       for (s = 0; s < nscreens; s++)
+               unlockscreen(dpy, locks[s]);
 
        free(locks);
        XCloseDisplay(dpy);
 
        free(locks);
        XCloseDisplay(dpy);