From: Andreas Dilger Subject: Re: [Ext2-devel] Re: ext3 -> crash -> fsck -> readlink -> oops Date: Fri, 17 May 2002 04:01:08 -0600 Sender: linux-fsdevel-owner@vger.kernel.org Message-ID: <20020517100108.GQ12975@turbolinux.com> References: <3CE46CF0.E0C9BCC5@zip.com.au> <20020517104034.B2693@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Andrew Morton , "H. Peter Anvin" , linux-fsdevel@vger.kernel.org, ext2-devel@lists.sourceforge.net Return-path: To: "Stephen C. Tweedie" Content-Disposition: inline In-Reply-To: <20020517104034.B2693@redhat.com> List-Id: linux-fsdevel.vger.kernel.org On May 17, 2002 10:40 +0100, Stephen C. Tweedie wrote: > On Thu, May 16, 2002 at 07:37:36PM -0700, Andrew Morton wrote: > > > - len = strlen(link); > > + len = strnlen(link, PAGE_CACHE_SIZE); > > if (len > (unsigned) buflen) > > len = buflen; > > Well, if we're going to be testing against buflen anyway, then > > --- fs/namei.c.~1~ Thu May 9 17:13:32 2002 > +++ fs/namei.c Fri May 17 10:37:58 2002 > @@ -1947,9 +1947,7 @@ > if (IS_ERR(link)) > goto out; > > - len = strlen(link); > - if (len > (unsigned) buflen) > - len = buflen; > + len = strnlen(link, buflen); > if (copy_to_user(buffer, link, len)) > len = -EFAULT; > out: Except that buflen is passed in from userspace, so the user could allocate a 8MB buffer and try to read a broken symlink to get access to kernel memory. How about: --- fs/namei.c.~1~ Thu May 9 17:13:32 2002 +++ fs/namei.c Fri May 17 10:37:58 2002 @@ -1947,9 +1947,7 @@ if (IS_ERR(link)) goto out; - len = strlen(link); - if (len > (unsigned) buflen) - len = buflen; + len = strnlen(link, min(buflen, PAGE_SIZE)); if (copy_to_user(buffer, link, len)) len = -EFAULT; out: Cheers, Andreas -- Andreas Dilger http://www-mddsp.enel.ucalgary.ca/People/adilger/ http://sourceforge.net/projects/ext2resize/