From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935183AbbDIKEu (ORCPT ); Thu, 9 Apr 2015 06:04:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58922 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932887AbbDIIvK (ORCPT ); Thu, 9 Apr 2015 04:51:10 -0400 Date: Thu, 9 Apr 2015 10:51:05 +0200 From: Jan Kara To: Fabian Frederick Cc: linux-kernel@vger.kernel.org, Jan Kara Subject: Re: [PATCH V2 7/9 linux-next] udf: return error when newIndex is 0 in udf_translate_to_linux() Message-ID: <20150409085105.GG18044@quack.suse.cz> References: <1428521039-18491-1-git-send-email-fabf@skynet.be> <1428521039-18491-8-git-send-email-fabf@skynet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1428521039-18491-8-git-send-email-fabf@skynet.be> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed 08-04-15 21:23:57, Fabian Frederick wrote: > udf_get_filename() and its callsites considered 0 as an error > without propagating an error value. > > udf_translate_to_linux() now returns -EINVAL when newIndex is 0. > other functions are updated accordingly. > > Signed-off-by: Fabian Frederick I've updated modified this patch and the changelog to do the check for zero length filename in udf_get_filename() and not in udf_translate_to_linux(). Since the second is just a general conversion function and zero length string as a result is fine with that. But zero length file name isn't correct and that's why udf_get_filename() should generate the error. I've also updated the changelog accordingly. Honza > --- > fs/udf/dir.c | 2 +- > fs/udf/namei.c | 2 +- > fs/udf/unicode.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/udf/dir.c b/fs/udf/dir.c > index fcf227e..541d9c6 100644 > --- a/fs/udf/dir.c > +++ b/fs/udf/dir.c > @@ -168,7 +168,7 @@ static int udf_readdir(struct file *file, struct dir_context *ctx) > } > > flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN); > - if (flen <= 0) > + if (flen < 0) > continue; > > tloc = lelb_to_cpu(cfi.icb.extLocation); > diff --git a/fs/udf/namei.c b/fs/udf/namei.c > index 59b340c..dd648b7 100644 > --- a/fs/udf/namei.c > +++ b/fs/udf/namei.c > @@ -234,7 +234,7 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir, > continue; > > flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN); > - if ((flen > 0) && udf_match(flen, fname, child->len, > + if ((flen >= 0) && udf_match(flen, fname, child->len, > child->name)) > goto out_ok; > } > diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c > index f37123b..3b1efbb 100644 > --- a/fs/udf/unicode.c > +++ b/fs/udf/unicode.c > @@ -333,7 +333,7 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen, > uint8_t *dname, int dlen) > { > struct ustr *filename, *unifilename; > - int ret = 0; > + int ret; > > if (!slen) > return -EIO; > @@ -492,5 +492,5 @@ static int udf_translate_to_linux(uint8_t *newName, int newLen, > } > } > > - return newIndex; > + return newIndex ? : -EINVAL; > } > -- > 1.9.1 > -- Jan Kara SUSE Labs, CR