2019-05-27 08:55:05 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* Copyright (C) International Business Machines Corp., 2000-2004
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include "jfs_incore.h"
|
|
|
|
#include "jfs_filsys.h"
|
|
|
|
#include "jfs_unicode.h"
|
|
|
|
#include "jfs_debug.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NAME: jfs_strfromUCS()
|
|
|
|
*
|
|
|
|
* FUNCTION: Convert little-endian unicode string to character string
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
int jfs_strfromUCS_le(char *to, const __le16 * from,
|
|
|
|
int len, struct nls_table *codepage)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int outlen = 0;
|
|
|
|
static int warn_again = 5; /* Only warn up to 5 times total */
|
|
|
|
int warn = !!warn_again; /* once per string */
|
|
|
|
|
|
|
|
if (codepage) {
|
|
|
|
for (i = 0; (i < len) && from[i]; i++) {
|
|
|
|
int charlen;
|
|
|
|
charlen =
|
|
|
|
codepage->uni2char(le16_to_cpu(from[i]),
|
|
|
|
&to[outlen],
|
|
|
|
NLS_MAX_CHARSET_SIZE);
|
|
|
|
if (charlen > 0)
|
|
|
|
outlen += charlen;
|
|
|
|
else
|
|
|
|
to[outlen++] = '?';
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; (i < len) && from[i]; i++) {
|
2005-06-23 23:57:56 +02:00
|
|
|
if (unlikely(le16_to_cpu(from[i]) & 0xff00)) {
|
|
|
|
to[i] = '?';
|
|
|
|
if (unlikely(warn)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
warn--;
|
|
|
|
warn_again--;
|
|
|
|
printk(KERN_ERR
|
2006-10-02 16:55:27 +02:00
|
|
|
"non-latin1 character 0x%x found in JFS file name\n",
|
|
|
|
le16_to_cpu(from[i]));
|
2005-04-17 00:20:36 +02:00
|
|
|
printk(KERN_ERR
|
|
|
|
"mount with iocharset=utf8 to access\n");
|
|
|
|
}
|
2005-06-23 23:57:56 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
to[i] = (char) (le16_to_cpu(from[i]));
|
|
|
|
}
|
|
|
|
outlen = i;
|
|
|
|
}
|
|
|
|
to[outlen] = 0;
|
|
|
|
return outlen;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NAME: jfs_strtoUCS()
|
|
|
|
*
|
|
|
|
* FUNCTION: Convert character string to unicode string
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int jfs_strtoUCS(wchar_t * to, const unsigned char *from, int len,
|
|
|
|
struct nls_table *codepage)
|
|
|
|
{
|
|
|
|
int charlen;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (codepage) {
|
|
|
|
for (i = 0; len && *from; i++, from += charlen, len -= charlen)
|
|
|
|
{
|
|
|
|
charlen = codepage->char2uni(from, len, &to[i]);
|
|
|
|
if (charlen < 1) {
|
|
|
|
jfs_err("jfs_strtoUCS: char2uni returned %d.",
|
|
|
|
charlen);
|
|
|
|
jfs_err("charset = %s, char = 0x%x",
|
|
|
|
codepage->charset, *from);
|
|
|
|
return charlen;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; (i < len) && from[i]; i++)
|
|
|
|
to[i] = (wchar_t) from[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
to[i] = 0;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NAME: get_UCSname()
|
|
|
|
*
|
|
|
|
* FUNCTION: Allocate and translate to unicode string
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
int get_UCSname(struct component_name * uniName, struct dentry *dentry)
|
|
|
|
{
|
|
|
|
struct nls_table *nls_tab = JFS_SBI(dentry->d_sb)->nls_tab;
|
|
|
|
int length = dentry->d_name.len;
|
|
|
|
|
|
|
|
if (length > JFS_NAME_MAX)
|
|
|
|
return -ENAMETOOLONG;
|
|
|
|
|
|
|
|
uniName->name =
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 22:55:00 +02:00
|
|
|
kmalloc_array(length + 1, sizeof(wchar_t), GFP_NOFS);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (uniName->name == NULL)
|
2006-09-14 16:22:38 +02:00
|
|
|
return -ENOMEM;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
uniName->namlen = jfs_strtoUCS(uniName->name, dentry->d_name.name,
|
|
|
|
length, nls_tab);
|
|
|
|
|
|
|
|
if (uniName->namlen < 0) {
|
|
|
|
kfree(uniName->name);
|
|
|
|
return uniName->namlen;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|