Skip to content

Commit

Permalink
selinuxfs: remove custom hex_to_bin()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Shevchenko authored and James Morris committed Nov 16, 2011
1 parent 59df316 commit af7ff2c
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions security/selinux/selinuxfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -749,14 +749,6 @@ static ssize_t sel_write_access(struct file *file, char *buf, size_t size)
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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit af7ff2c

Please sign in to comment.