DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version
         :content-type:content-transfer-encoding:content-disposition
         :references:x-google-sender-auth;
        b=r5djmk3TykhAJ/GO+ZjUxu1jJ4nvkJHsadYfQtV5P4xn35e+Fc23ajKGjvVXXR7SLp
         +fP5pAUdADc/cJdmLdWjNTuyS+ccgtPDRjlGkm6EZXP1t+JRnhPfw7Ymke5vUBIcmsNh
         AyavdUX289BzLI9VpXu5P72xElsO/WgCezBiU=
Message-ID: <e9e943910812111234h3e2bbc1bh934a6605f30b5fea@mail.gmail.com>
Date: Thu, 11 Dec 2008 20:34:46 +0000
From: "Duane Griffin" <duaneg@dghda.com>
To: "Dave Kleikamp" <shaggy@linux.vnet.ibm.com>
Subject: Re: [PATCH] JFS: ensure link targets are NULL-terminated
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
       "Boaz Harrosh" <bharrosh@panasas.com>,
       Dave.Kleikamp.shaggy@austin.ibm.com,
       jfs-discussion@lists.sourceforge.net
In-Reply-To: <1229025971.9245.18.camel@norville.austin.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <1229022995-9898-1-git-send-email-duaneg@dghda.com>
	 <1229022995-9898-2-git-send-email-duaneg@dghda.com>
	 <1229022995-9898-3-git-send-email-duaneg@dghda.com>
	 <1229022995-9898-4-git-send-email-duaneg@dghda.com>
	 <1229022995-9898-5-git-send-email-duaneg@dghda.com>
	 <1229022995-9898-6-git-send-email-duaneg@dghda.com>
	 <1229022995-9898-7-git-send-email-duaneg@dghda.com>
	 <1229022995-9898-8-git-send-email-duaneg@dghda.com>
	 <1229022995-9898-9-git-send-email-duaneg@dghda.com>
	 <1229025971.9245.18.camel@norville.austin.ibm.com>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1858
Lines: 46

2008/12/11 Dave Kleikamp <shaggy@linux.vnet.ibm.com>:
> Thanks.
>
> I came up with an alternate patch that I like slightly better.  This one
> null-terminates the string when the inode is read rather than every time
> the link is followed, and at the proper place (i_size).  It's not a big
> deal, since the symlink will be corrupted either way.  What do you think
> of this patch?
>
> Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
>
> diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
> index 2103397..b00ee9f 100644
> --- a/fs/jfs/inode.c
> +++ b/fs/jfs/inode.c
> @@ -59,8 +59,14 @@ struct inode *jfs_iget(struct super_block *sb, unsigned long ino)
>                if (inode->i_size >= IDATASIZE) {
>                        inode->i_op = &page_symlink_inode_operations;
>                        inode->i_mapping->a_ops = &jfs_aops;
> -               } else
> +               } else {
>                        inode->i_op = &jfs_symlink_inode_operations;
> +                       /*
> +                        * The inline data should be null-terminated, but
> +                        * don't let on-disk corruption crash the kernel
> +                        */
> +                       JFS_IP(inode)->i_inline[inode->i_size] = '\0';
> +               }
>        } else {
>                inode->i_op = &jfs_file_inode_operations;
>                init_special_inode(inode, inode->i_mode, inode->i_rdev);

Yes, I prefer your version too :)

I'll rework the other patches similarly, where appropriate. Thanks!

Cheers,
Duane.

-- 
"I never could learn to drink that blood and call it wine" - Bob Dylan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/