Re: [PATCH] nilfs2: unbreak compat ioctl

Re: [PATCH] nilfs2: unbreak compat ioctl

[Ryusuke Konishi]

On Mon, 07 Nov 2011 21:18:37 +0100, Thomas Meyer wrote:
> I guess commit 828b1c50ae11e6dda68f8dfefe43b74c7182b157 incidentally broke
> all other compat ioctls. make them work again.
> 
> Signed-off-by: Thomas Meyer <thomas-VsYtu1Qij5c@public.gmane.org>
> ---
>  fs/nilfs2/ioctl.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
> index 41d6743..1773a98 100644
> --- a/fs/nilfs2/ioctl.c
> +++ b/fs/nilfs2/ioctl.c
> @@ -842,8 +842,6 @@ long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>  	case FS_IOC32_GETVERSION:
>  		cmd = FS_IOC_GETVERSION;
>  		break;
> -	default:
> -		return -ENOIOCTLCMD;
>  	}
>  	return nilfs_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));
>  }
> -- 
> 1.7.7

Hi, thank you for pointing this out.

But, this patch looks to prevent compat_sys_ioctl() from handling
other compatible ioctls that compat_ioctl_check_table function
detects.  For instance, fiemap (FS_IOC_FIEMAP) is handled via the
function.

I think we should only redirect own ioctl commands
(i.e. NILFS_IOCTL_xxxx) to the nilfs_ioctl() call.


Regards,
Ryusuke Konishi
--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] nilfs2: unbreak compat ioctl

[Thomas Meyer]

Am Donnerstag, den 10.11.2011, 12:49 +0900 schrieb Ryusuke Konishi:
> But, this patch looks to prevent compat_sys_ioctl() from handling
> other compatible ioctls that compat_ioctl_check_table function
> detects.  For instance, fiemap (FS_IOC_FIEMAP) is handled via the
> function.
> 
> I think we should only redirect own ioctl commands
> (i.e. NILFS_IOCTL_xxxx) to the nilfs_ioctl() call.

Hello Ryusuke,

something like this?

kind regards
thomas

From 241cc9e8c7d6b8218d307117b0d4a0dabbe1d94e Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas-VsYtu1Qij5c@public.gmane.org>
Date: Mon, 7 Nov 2011 20:59:02 +0100
Subject: [PATCH] nilfs2: unbreak compat ioctl

I guess commit 828b1c50ae11e6dda68f8dfefe43b74c7182b157 incidentally broke
all other NILFS compat ioctls. make them work again.

Signed-off-by: Thomas Meyer <thomas-VsYtu1Qij5c@public.gmane.org>
---
 fs/nilfs2/ioctl.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 41d6743..3e65427 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -842,6 +842,19 @@ long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	case FS_IOC32_GETVERSION:
 		cmd = FS_IOC_GETVERSION;
 		break;
+	case NILFS_IOCTL_CHANGE_CPMODE:
+	case NILFS_IOCTL_DELETE_CHECKPOINT:
+	case NILFS_IOCTL_GET_CPINFO:
+	case NILFS_IOCTL_GET_CPSTAT:
+	case NILFS_IOCTL_GET_SUINFO:
+	case NILFS_IOCTL_GET_SUSTAT:
+	case NILFS_IOCTL_GET_VINFO:
+	case NILFS_IOCTL_GET_BDESCS:
+	case NILFS_IOCTL_CLEAN_SEGMENTS:
+	case NILFS_IOCTL_SYNC:
+	case NILFS_IOCTL_RESIZE:
+	case NILFS_IOCTL_SET_ALLOC_RANGE:
+		break;
 	default:
 		return -ENOIOCTLCMD;
 	}
-- 
1.7.7.1


--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] nilfs2: unbreak compat ioctl

[Ryusuke Konishi]

On Sun, 13 Nov 2011 11:32:14 +0100, Thomas Meyer wrote:
> Am Donnerstag, den 10.11.2011, 12:49 +0900 schrieb Ryusuke Konishi:
> > But, this patch looks to prevent compat_sys_ioctl() from handling
> > other compatible ioctls that compat_ioctl_check_table function
> > detects.  For instance, fiemap (FS_IOC_FIEMAP) is handled via the
> > function.
> > 
> > I think we should only redirect own ioctl commands
> > (i.e. NILFS_IOCTL_xxxx) to the nilfs_ioctl() call.
> 
> Hello Ryusuke,
> 
> something like this?

Thanks, it looks fine to me.

I'll send it upstream after testing it against a 64-bit kernel
environment with a 32-bit userspace.

Regards,
Ryusuke Konishi


> kind regards
> thomas
> 
> From 241cc9e8c7d6b8218d307117b0d4a0dabbe1d94e Mon Sep 17 00:00:00 2001
> From: Thomas Meyer <thomas-VsYtu1Qij5c@public.gmane.org>
> Date: Mon, 7 Nov 2011 20:59:02 +0100
> Subject: [PATCH] nilfs2: unbreak compat ioctl
> 
> I guess commit 828b1c50ae11e6dda68f8dfefe43b74c7182b157 incidentally broke
> all other NILFS compat ioctls. make them work again.
> 
> Signed-off-by: Thomas Meyer <thomas-VsYtu1Qij5c@public.gmane.org>
> ---
>  fs/nilfs2/ioctl.c |   13 +++++++++++++
>  1 files changed, 13 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
> index 41d6743..3e65427 100644
> --- a/fs/nilfs2/ioctl.c
> +++ b/fs/nilfs2/ioctl.c
> @@ -842,6 +842,19 @@ long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>  	case FS_IOC32_GETVERSION:
>  		cmd = FS_IOC_GETVERSION;
>  		break;
> +	case NILFS_IOCTL_CHANGE_CPMODE:
> +	case NILFS_IOCTL_DELETE_CHECKPOINT:
> +	case NILFS_IOCTL_GET_CPINFO:
> +	case NILFS_IOCTL_GET_CPSTAT:
> +	case NILFS_IOCTL_GET_SUINFO:
> +	case NILFS_IOCTL_GET_SUSTAT:
> +	case NILFS_IOCTL_GET_VINFO:
> +	case NILFS_IOCTL_GET_BDESCS:
> +	case NILFS_IOCTL_CLEAN_SEGMENTS:
> +	case NILFS_IOCTL_SYNC:
> +	case NILFS_IOCTL_RESIZE:
> +	case NILFS_IOCTL_SET_ALLOC_RANGE:
> +		break;
>  	default:
>  		return -ENOIOCTLCMD;
>  	}
> -- 
> 1.7.7.1
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html