Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfat: deduplicate hex2bin()

Browse Source 
We may use hex2bin() instead of custom approach.

Link: http://lkml.kernel.org/r/87zibktpil.fsf@devron
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
OGAWA Hirofumi 2017-09-08 16:16:50 -07:00 committed by Linus Torvalds
parent b9fa2ad1ed
commit 5680db4b66
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fs/fat/namei_vfat.c
View File

@ -19,6 +19,8 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/kernel.h>
#include "fat.h" #include "fat.h"
static inline unsigned long vfat_d_version(struct dentry *dentry) static inline unsigned long vfat_d_version(struct dentry *dentry)
@ -510,10 +512,8 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname,
struct nls_table *nls) struct nls_table *nls)
{ {
const unsigned char *ip; const unsigned char *ip;
unsigned char nc;
unsigned char *op; unsigned char *op;
unsigned int ec; int i, fill;
int i, k, fill;
int charlen; int charlen;
if (utf8) { if (utf8) {
@ -530,33 +530,22 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname,
i < len && *outlen < FAT_LFN_LEN; i < len && *outlen < FAT_LFN_LEN;
*outlen += 1) { *outlen += 1) {
if (escape && (*ip == ':')) { if (escape && (*ip == ':')) {
u8 uc[2];
if (i > len - 5) if (i > len - 5)
return -EINVAL; return -EINVAL;
ec = 0;
for (k = 1; k < 5; k++) { if (hex2bin(uc, ip + 1, 2) < 0)
nc = ip[k];
ec <<= 4;
if (nc >= '0' && nc <= '9') {
ec |= nc - '0';
continue;
}
if (nc >= 'a' && nc <= 'f') {
ec |= nc - ('a' - 10);
continue;
}
if (nc >= 'A' && nc <= 'F') {
ec |= nc - ('A' - 10);
continue;
}
return -EINVAL; return -EINVAL;
}
*op++ = ec & 0xFF; *(wchar_t *)op = uc[0] << 8 | uc[1];
*op++ = ec >> 8;
op += 2;
ip += 5; ip += 5;
i += 5; i += 5;
} else { } else {
charlen = nls->char2uni(ip, len - i, charlen = nls->char2uni(ip, len - i,
(wchar_t *)op); (wchar_t *)op);
if (charlen < 0) if (charlen < 0)
return -EINVAL; return -EINVAL;
ip += charlen; ip += charlen;