[<prev] [next>] [day] [month] [year] [list]
Message-Id: <db0926c83fcf7299ac345dc050c31ba3c26bf07c.1310977455.git.andriy.shevchenko@linux.intel.com>
Date: Mon, 18 Jul 2011 11:24:40 +0300
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: linux-kernel@...r.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Eric Paris <eparis@...isplace.org>,
linux-security-module@...r.kernel.org
Subject: [PATCH] selinuxfs: remove custome hex_to_bin()
Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc: Eric Paris <eparis@...isplace.org>
Cc: linux-security-module@...r.kernel.org
---
security/selinux/selinuxfs.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 3545934..2aad7eb 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -752,14 +752,6 @@ out:
return length;
}
-static inline int hexcode_to_int(int code) {
- if (code == '\0' || !isxdigit(code))
- return -1;
- if (isdigit(code))
- return code - '0';
- return tolower(code) - 'a' + 10;
-}
-
static ssize_t sel_write_create(struct file *file, char *buf, size_t size)
{
char *scon = NULL, *tcon = NULL;
@@ -811,9 +803,11 @@ static ssize_t sel_write_create(struct file *file, char *buf, size_t size)
if (c1 == '+')
c1 = ' ';
else if (c1 == '%') {
- if ((c1 = hexcode_to_int(*r++)) < 0)
+ c1 = hex_to_bin(*r++);
+ if (c1 < 0)
goto out;
- if ((c2 = hexcode_to_int(*r++)) < 0)
+ c2 = hex_to_bin(*r++);
+ if (c2 < 0)
goto out;
c1 = (c1 << 4) | c2;
}
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists