chiark / gitweb /
sd-id128: do stricter checking of random boot id
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 4 Oct 2014 00:57:30 +0000 (20:57 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 4 Oct 2014 00:57:30 +0000 (20:57 -0400)
If we are bothering to check whether the kernel is not feeding us
bad data, we might as well do it properly.

CID #1237692.

src/libsystemd/sd-id128/sd-id128.c

index a1e44e6..233ffa0 100644 (file)
@@ -183,11 +183,14 @@ _public_ int sd_id128_get_boot(sd_id128_t *ret) {
         for (j = 0, p = buf; j < 16; j++) {
                 int a, b;
 
-                if (p >= buf + k)
+                if (p >= buf + k - 1)
                         return -EIO;
 
-                if (*p == '-')
+                if (*p == '-') {
                         p++;
+                        if (p >= buf + k - 1)
+                                return -EIO;
+                }
 
                 a = unhexchar(p[0]);
                 b = unhexchar(p[1]);