Commit 9fba7056 authored by Andrew Gabbasov's avatar Andrew Gabbasov Committed by Jan Kara
Browse files

udf: Adjust UDF_NAME_LEN to better reflect actual restrictions 



Actual name length restriction is 254 bytes, this is used in 'ustr'
structure, and this is what fits into UDF File Ident structures.
And in most cases the constant is used as UDF_NAME_LEN-2.
So, it's better to just modify the constant to make it closer
to reality.

Also, in some cases it's useful to have a separate constant for
the maximum length of file name field in CS0 encoding in UDF File
Ident structures.

Also, remove the unused UDF_PATH_LEN constant.

Signed-off-by: default avatarAndrew Gabbasov <andrew_gabbasov@mentor.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 3e7fc205

fs/udf/namei.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -291,7 +291,7 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry, 
	struct udf_fileident_bh fibh;

	struct udf_fileident_bh fibh;

	struct fileIdentDesc *fi;

	struct fileIdentDesc *fi;





	if (dentry->d_name.len > UDF_NAME_LEN - 2)

	if (dentry->d_name.len > UDF_NAME_LEN)

		return ERR_PTR(-ENAMETOOLONG);

		return ERR_PTR(-ENAMETOOLONG);





#ifdef UDF_RECOVERY

#ifdef UDF_RECOVERY
@@ -351,7 +351,7 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir, 
	struct udf_inode_info *dinfo;

	struct udf_inode_info *dinfo;





	fibh->sbh = fibh->ebh = NULL;

	fibh->sbh = fibh->ebh = NULL;

	name = kmalloc(UDF_NAME_LEN, GFP_NOFS);

	name = kmalloc(UDF_NAME_LEN_CS0, GFP_NOFS);

	if (!name) {

	if (!name) {

		*err = -ENOMEM;

		*err = -ENOMEM;

		goto out_err;

		goto out_err;
@@ -364,7 +364,7 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir, 
		}

		}

		namelen = udf_put_filename(sb, dentry->d_name.name,

		namelen = udf_put_filename(sb, dentry->d_name.name,

					   dentry->d_name.len,

					   dentry->d_name.len,

					   name, UDF_NAME_LEN);

					   name, UDF_NAME_LEN_CS0);

		if (!namelen) {

		if (!namelen) {

			*err = -ENAMETOOLONG;

			*err = -ENAMETOOLONG;

			goto out_err;

			goto out_err;
@@ -915,7 +915,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, 




	iinfo = UDF_I(inode);

	iinfo = UDF_I(inode);

	down_write(&iinfo->i_data_sem);

	down_write(&iinfo->i_data_sem);

	name = kmalloc(UDF_NAME_LEN, GFP_NOFS);

	name = kmalloc(UDF_NAME_LEN_CS0, GFP_NOFS);

	if (!name) {

	if (!name) {

		err = -ENOMEM;

		err = -ENOMEM;

		goto out_no_entry;

		goto out_no_entry;
@@ -1000,7 +1000,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, 
		if (pc->componentType == 5) {

		if (pc->componentType == 5) {

			namelen = udf_put_filename(sb, compstart,

			namelen = udf_put_filename(sb, compstart,

						   symname - compstart,

						   symname - compstart,

						   name, UDF_NAME_LEN);

						   name, UDF_NAME_LEN_CS0);

			if (!namelen)

			if (!namelen)

				goto out_no_entry;

				goto out_no_entry;

fs/udf/super.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2358,7 +2358,7 @@ static int udf_statfs(struct dentry *dentry, struct kstatfs *buf) 
					  le32_to_cpu(lvidiu->numDirs)) : 0)

					  le32_to_cpu(lvidiu->numDirs)) : 0)

			+ buf->f_bfree;

			+ buf->f_bfree;

	buf->f_ffree = buf->f_bfree;

	buf->f_ffree = buf->f_bfree;

	buf->f_namelen = UDF_NAME_LEN - 2;

	buf->f_namelen = UDF_NAME_LEN;

	buf->f_fsid.val[0] = (u32)id;

	buf->f_fsid.val[0] = (u32)id;

	buf->f_fsid.val[1] = (u32)(id >> 32);

	buf->f_fsid.val[1] = (u32)(id >> 32);

fs/udf/udfdecl.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -49,8 +49,8 @@ extern __printf(3, 4) void _udf_warn(struct super_block *sb, 
#define UDF_EXTENT_FLAG_MASK	0xC0000000

#define UDF_EXTENT_FLAG_MASK	0xC0000000





#define UDF_NAME_PAD		4

#define UDF_NAME_PAD		4

#define UDF_NAME_LEN		256

#define UDF_NAME_LEN		254

#define UDF_PATH_LEN		1023

#define UDF_NAME_LEN_CS0	255





static inline size_t udf_file_entry_alloc_offset(struct inode *inode)

static inline size_t udf_file_entry_alloc_offset(struct inode *inode)

{

{
@@ -108,7 +108,7 @@ struct generic_desc { 




struct ustr {

struct ustr {

	uint8_t u_cmpID;

	uint8_t u_cmpID;

	uint8_t u_name[UDF_NAME_LEN - 2];

	uint8_t u_name[UDF_NAME_LEN];

	uint8_t u_len;

	uint8_t u_len;

};

};

fs/udf/unicode.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ static int udf_translate_to_linux(uint8_t *, int, uint8_t *, int, uint8_t *, 




static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)

static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)

{

{

	if ((!dest) || (!src) || (!strlen) || (strlen > UDF_NAME_LEN - 2))

	if ((!dest) || (!src) || (!strlen) || (strlen > UDF_NAME_LEN))

		return 0;

		return 0;





	memset(dest, 0, sizeof(struct ustr));

	memset(dest, 0, sizeof(struct ustr));
@@ -184,14 +184,14 @@ static int udf_name_from_CS0(struct ustr *utf_o, 




	ocu = ocu_i->u_name;

	ocu = ocu_i->u_name;

	utf_o->u_len = 0;

	utf_o->u_len = 0;

	for (i = 0; (i < ocu_len) && (utf_o->u_len <= (UDF_NAME_LEN - 3));) {

	for (i = 0; (i < ocu_len) && (utf_o->u_len < UDF_NAME_LEN);) {

		/* Expand OSTA compressed Unicode to Unicode */

		/* Expand OSTA compressed Unicode to Unicode */

		uint32_t c = ocu[i++];

		uint32_t c = ocu[i++];

		if (cmp_id == 16)

		if (cmp_id == 16)

			c = (c << 8) | ocu[i++];

			c = (c << 8) | ocu[i++];





		len = conv_f(c, &utf_o->u_name[utf_o->u_len],

		len = conv_f(c, &utf_o->u_name[utf_o->u_len],

			     UDF_NAME_LEN - 2 - utf_o->u_len);

			     UDF_NAME_LEN - utf_o->u_len);

		/* Valid character? */

		/* Valid character? */

		if (len >= 0)

		if (len >= 0)

			utf_o->u_len += len;

			utf_o->u_len += len;

CRA Git | Maintained and supported by SUSTech CRA and CCSE