linux-kernel - Re: [PATCH V2 5/9 linux-next] udf: improve error management in udf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 9 Apr 2015 13:54:18 +0200
From:	Jan Kara <jack@...e.cz>
To:	Fabian Frederick <fabf@...net.be>
Cc:	linux-kernel@...r.kernel.org, Jan Kara <jack@...e.cz>
Subject: Re: [PATCH V2 5/9 linux-next] udf: improve error management in
 udf_CS0toNLS()

On Thu 09-04-15 10:37:42, Jan Kara wrote:
> On Wed 08-04-15 21:23:55, Fabian Frederick wrote:
> > Only callsite udf_get_filename() now returns
> > error code as well.
>   Did same modification as in the previous patch. Otherwise OK, so I've
> merged the patch.
  The resulting patch is attached for reference.

								Honza

> > Suggested-by: Jan Kara <jack@...e.cz>
> > Signed-off-by: Fabian Frederick <fabf@...net.be>
> > ---
> >  fs/udf/unicode.c | 9 +++++----
> >  1 file changed, 5 insertions(+), 4 deletions(-)
> > 
> > diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
> > index 9008a36..488a838 100644
> > --- a/fs/udf/unicode.c
> > +++ b/fs/udf/unicode.c
> > @@ -257,7 +257,7 @@ static int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o,
> >  	ocu_len = ocu_i->u_len;
> >  	if (ocu_len == 0) {
> >  		memset(utf_o, 0, sizeof(struct ustr));
> > -		return 0;
> > +		return -EINVAL;
> >  	}
> >  
> >  	cmp_id = ocu_i->u_cmpID;
> > @@ -265,7 +265,7 @@ static int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o,
> >  		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;
> > @@ -357,8 +357,9 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
> >  			goto out2;
> >  		}
> >  	} else if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) {
> > -		if (!udf_CS0toNLS(UDF_SB(sb)->s_nls_map, filename,
> > -				  unifilename)) {
> > +		ret = udf_CS0toNLS(UDF_SB(sb)->s_nls_map, filename,
> > +				   unifilename);
> > +		if (ret < 0) {
> >  			udf_debug("Failed in udf_get_filename: sname = %s\n",
> >  				  sname);
> >  			goto out2;
> > -- 
> > 1.9.1
> > 
> -- 
> Jan Kara <jack@...e.cz>
> SUSE Labs, CR
-- 
Jan Kara <jack@...e.cz>
SUSE Labs, CR

View attachment "0005-udf-improve-error-management-in-udf_CS0toNLS.patch" of type "text/x-patch" (1343 bytes)