diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2011-11-15 15:11:41 -0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-16 11:30:26 +1100 |
| commit | af7ff2c2c45e6c6d533dd968709732da3d1d48f8 (patch) | |
| tree | 5c3809af634ee633d351c04d7201324d7da4ca82 | |
| parent | 59df3166ef293288d164ab3362a717743e62d20c (diff) | |
| download | op-kernel-dev-af7ff2c2c45e6c6d533dd968709732da3d1d48f8.zip op-kernel-dev-af7ff2c2c45e6c6d533dd968709732da3d1d48f8.tar.gz | |
selinuxfs: remove custom hex_to_bin()
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Eric Paris <eparis@parisplace.org>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | 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 f466587..48a7d00 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -749,14 +749,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; @@ -808,9 +800,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; } |
