Patch "jfs: fix readdir regression" has been added to the 3.10-stable tree

Patch "jfs: fix readdir regression" has been added to the 3.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    jfs: fix readdir regression

to the 3.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     jfs-fix-readdir-regression.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From dave.kleikamp@oracle.com  Sun Apr 26 11:32:43 2015
From: Dave Kleikamp <dave.kleikamp@oracle.com>
Date: Mon, 23 Mar 2015 16:06:26 -0500
Subject: jfs: fix readdir regression
To: stable <stable@vger.kernel.org>
Cc: JFS Discussion <jfs-discussion@lists.sourceforge.net>
Message-ID: <55108052.6070603@oracle.com>

From: Dave Kleikamp <dave.kleikamp@oracle.com>

Upstream commit 44512449, "jfs: fix readdir cookie incompatibility
with NFSv4", was backported incorrectly into the stable trees which
used the filldir callback (rather than dir_emit). The position is
being incorrectly passed to filldir for the . and .. entries.

The still-maintained stable trees that need to be fixed are 3.2.y,
3.4.y and 3.10.y.

https://bugzilla.kernel.org/show_bug.cgi?id=94741

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: jfs-discussion@lists.sourceforge.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 fs/jfs/jfs_dtree.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -3103,7 +3103,7 @@ int jfs_readdir(struct file *filp, void
 				 * self "."
 				 */
 				filp->f_pos = 1;
-				if (filldir(dirent, ".", 1, 0, ip->i_ino,
+				if (filldir(dirent, ".", 1, 1, ip->i_ino,
 					    DT_DIR))
 					return 0;
 			}
@@ -3111,7 +3111,7 @@ int jfs_readdir(struct file *filp, void
 			 * parent ".."
 			 */
 			filp->f_pos = 2;
-			if (filldir(dirent, "..", 2, 1, PARENT(ip), DT_DIR))
+			if (filldir(dirent, "..", 2, 2, PARENT(ip), DT_DIR))
 				return 0;
 
 			/*


Patches currently in stable-queue which might be from dave.kleikamp@oracle.com are

queue-3.10/jfs-fix-readdir-regression.patch

Re: [PATCH][3.2.y][3.4.y][3.10.y] jfs: fix readdir regression

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

On Mon, 2015-03-23 at 16:06 -0500, Dave Kleikamp wrote:
> Upstream commit 44512449, "jfs: fix readdir cookie incompatibility
> with NFSv4", was backported incorrectly into the stable trees which
> used the filldir callback (rather than dir_emit). The position is
> being incorrectly passed to filldir for the . and .. entries.
> 
> The still-maintained stable trees that need to be fixed are 3.2.y,
> 3.4.y and 3.10.y.

Queued up for 3.2, thanks.

Ben.

> https://bugzilla.kernel.org/show_bug.cgi?id=94741
> 
> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
> Cc: jfs-discussion@lists.sourceforge.net
> Cc: stable@vger.kernel.org
> ---
>  fs/jfs/jfs_dtree.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
> index 9f7c758..f6f32fa 100644
> --- a/fs/jfs/jfs_dtree.c
> +++ b/fs/jfs/jfs_dtree.c
> @@ -3103,7 +3103,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
>  				 * self "."
>  				 */
>  				filp->f_pos = 1;
> -				if (filldir(dirent, ".", 1, 0, ip->i_ino,
> +				if (filldir(dirent, ".", 1, 1, ip->i_ino,
>  					    DT_DIR))
>  					return 0;
>  			}
> @@ -3111,7 +3111,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
>  			 * parent ".."
>  			 */
>  			filp->f_pos = 2;
> -			if (filldir(dirent, "..", 2, 1, PARENT(ip), DT_DIR))
> +			if (filldir(dirent, "..", 2, 2, PARENT(ip), DT_DIR))
>  				return 0;
>  
>  			/*

-- 
Ben Hutchings
One of the nice things about standards is that there are so many of them.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]