Commit e9d4cf41 authored by Fabian Frederick's avatar Fabian Frederick Committed by Jan Kara
Browse files

udf: improve error management in udf_CS0toUTF8() 



udf_CS0toUTF8() now returns -EINVAL on error.
udf_load_pvoldesc() and udf_get_filename() do the same.

Suggested-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent d67e4a48

fs/udf/super.c

+14 −9
Original line number Diff line number Diff line
@@ -927,16 +927,21 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block) 
#endif

	}



	if (!udf_build_ustr(instr, pvoldesc->volIdent, 32))

		if (udf_CS0toUTF8(outstr, instr)) {

	if (!udf_build_ustr(instr, pvoldesc->volIdent, 32)) {

		ret = udf_CS0toUTF8(outstr, instr);

		if (ret < 0)

			goto out_bh;



		strncpy(UDF_SB(sb)->s_volume_ident, outstr->u_name,

			outstr->u_len > 31 ? 31 : outstr->u_len);

			udf_debug("volIdent[] = '%s'\n",

				  UDF_SB(sb)->s_volume_ident);

		udf_debug("volIdent[] = '%s'\n", UDF_SB(sb)->s_volume_ident);

	}



	if (!udf_build_ustr(instr, pvoldesc->volSetIdent, 128))

		if (udf_CS0toUTF8(outstr, instr))

		ret = udf_CS0toUTF8(outstr, instr);

		if (ret < 0)

			goto out_bh;



		udf_debug("volSetIdent[] = '%s'\n", outstr->u_name);



	ret = 0;

fs/udf/unicode.c

+4 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void udf_build_ustr_exact(struct ustr *dest, dstring *ptr, int exactsize) 
 * 				both of type "struct ustr *"

 *

 * POST-CONDITIONS

 *	<return>		Zero on success.

 *	<return>		>= 0 on success.

 *

 * HISTORY

 *	November 12, 1997 - Andrew E. Mileski
@@ -112,7 +112,7 @@ int udf_CS0toUTF8(struct ustr *utf_o, const struct ustr *ocu_i) 
		memset(utf_o, 0, sizeof(struct ustr));

		pr_err("unknown compression code (%d) stri=%s\n",

		       cmp_id, ocu_i->u_name);

		return 0;

		return -EINVAL;

	}



	ocu = ocu_i->u_name;
@@ -350,7 +350,8 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen, 


	udf_build_ustr_exact(unifilename, sname, slen);

	if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) {

		if (!udf_CS0toUTF8(filename, unifilename)) {

		ret = udf_CS0toUTF8(filename, unifilename);

		if (ret < 0) {

			udf_debug("Failed in udf_get_filename: sname = %s\n",

				  sname);

			goto out2;