idmapd: Fix decoding of octal encoded fields

The decoded octal will always be positive and (char) -1 is negative. Any
field containing an encoded octal will be rejected.

As the encoded value should be an unsigned char, fix the check to reject
all values > (unsigned char) -1 = UCHAR_MAX, as this indicate an error
in the encoding.

Signed-off-by: Jan-Marek Glogowski <glogow@fbihome.de>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index 76a56ef6b58f7a8f0d5efa8c7f2f6350f81e3a14..19d91147eaed2a990694a33e683e99e1fcef892c 100644 (file)
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -925,9 +925,9 @@ getfield(char **bpp, char *fld, size_t fldsz)
                if (*bp == '\\') {
                        if ((n = sscanf(bp, "\\%03o", &val)) != 1)
                                return (-1);
                if (*bp == '\\') {
                        if ((n = sscanf(bp, "\\%03o", &val)) != 1)
                                return (-1);

-                       if (val > (char)-1)
+                       if (val > UCHAR_MAX)

                                return (-1);
                                return (-1);

-                       *fld++ = (char)val;
+                       *fld++ = val;

                        bp += 4;
                } else {
                        *fld++ = *bp;
                        bp += 4;
                } else {
                        *fld++ = *bp;