[PATCH] Btrfs: don't use src fd for printk

[PATCH] Btrfs: don't use src fd for printk

[Jeff Mahoney]

From: Josef Bacik <jbacik@fb.com>

[ Upstream commit c79b4713304f812d3d6c95826fc3e5fc2c0b0c14 ]

The fd we pass in may not be on a btrfs file system, so don't try to do
BTRFS_I() on it.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Cc: stable@vger.kernel.org # 3.14+
---
 fs/btrfs/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 053e677..21423dd 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1654,7 +1654,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
 
 		src_inode = file_inode(src.file);
 		if (src_inode->i_sb != file_inode(file)->i_sb) {
-			btrfs_info(BTRFS_I(src_inode)->root->fs_info,
+			btrfs_info(BTRFS_I(file_inode(file))->root->fs_info,
 				   "Snapshot src from another FS");
 			ret = -EXDEV;
 		} else if (!inode_owner_or_capable(src_inode)) {

Re: [PATCH] Btrfs: don't use src fd for printk

[David Sterba]

On Tue, May 17, 2016 at 09:36:18AM -0400, Jeff Mahoney wrote:
> From: Josef Bacik <jbacik@fb.com>
> 
> [ Upstream commit c79b4713304f812d3d6c95826fc3e5fc2c0b0c14 ]
> 
> The fd we pass in may not be on a btrfs file system, so don't try to do
> BTRFS_I() on it.  Thanks,
> 
> Signed-off-by: Josef Bacik <jbacik@fb.com>
> Reviewed-by: David Sterba <dsterba@suse.com>
> Signed-off-by: David Sterba <dsterba@suse.com>
> Cc: stable@vger.kernel.org # 3.14+

This has been submitted to stable tree already (though not tagged as for
3.14+)

Re: [PATCH] Btrfs: don't use src fd for printk

[Ben Hutchings]

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

On Tue, 2016-05-17 at 09:36 -0400, Jeff Mahoney wrote:
> From: Josef Bacik <jbacik@fb.com>
> 
> [ Upstream commit c79b4713304f812d3d6c95826fc3e5fc2c0b0c14 ]
> 
> The fd we pass in may not be on a btrfs file system, so don't try to do
> BTRFS_I() on it.  Thanks,
> 
> Signed-off-by: Josef Bacik <jbacik@fb.com>
> Reviewed-by: David Sterba <dsterba@suse.com>
> Signed-off-by: David Sterba <dsterba@suse.com>
> Cc: stable@vger.kernel.org # 3.14+

Belatedly queued up for 3.16, thanks.

Ben.

> ---
>  fs/btrfs/ioctl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 053e677..21423dd 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -1654,7 +1654,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
>  
>  		src_inode = file_inode(src.file);
>  		if (src_inode->i_sb != file_inode(file)->i_sb) {
> -			btrfs_info(BTRFS_I(src_inode)->root->fs_info,
> +			btrfs_info(BTRFS_I(file_inode(file))->root->fs_info,
>  				   "Snapshot src from another FS");
>  			ret = -EXDEV;
>  		} else if (!inode_owner_or_capable(src_inode)) {
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
-- 
Ben Hutchings
compatible: Gracefully accepts erroneous data from any source


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

[PATCH] Btrfs: don't use src fd for printk

[Josef Bacik]

The fd we pass in may not be on a btrfs file system, so don't try to do
BTRFS_I() on it.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
 fs/btrfs/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 8bbecda..b0d1345 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1644,7 +1644,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
 
 		src_inode = file_inode(src.file);
 		if (src_inode->i_sb != file_inode(file)->i_sb) {
-			btrfs_info(BTRFS_I(src_inode)->root->fs_info,
+			btrfs_info(BTRFS_I(file_inode(file))->root->fs_info,
 				   "Snapshot src from another FS");
 			ret = -EXDEV;
 		} else if (!inode_owner_or_capable(src_inode)) {
-- 
2.5.0

Re: [PATCH] Btrfs: don't use src fd for printk

[David Sterba]

On Fri, Mar 25, 2016 at 10:02:41AM -0400, Josef Bacik wrote:
> The fd we pass in may not be on a btrfs file system, so don't try to do
> BTRFS_I() on it.  Thanks,
> 
> Signed-off-by: Josef Bacik <jbacik@fb.com>

Reviewed-by: David Sterba <dsterba@suse.com>