Re: [PATCH 02/25] userns: Convert gadgetfs to use kuid and kgidwhere appropriate

[Felipe Balbi]

On Thu, Sep 20, 2012 at 04:41:43AM -0700, Eric W. Biederman wrote:
> From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
> 
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: Felipe Balbi <balbi@xxxxxx>
> Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
> Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>

Acked-by: Felipe Balbi <balbi@xxxxxx>

> ---
>  drivers/usb/gadget/inode.c |    4 ++--
>  init/Kconfig               |    1 -
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
> index e58b164..7bd36c8 100644
> --- a/drivers/usb/gadget/inode.c
> +++ b/drivers/usb/gadget/inode.c
> @@ -1988,8 +1988,8 @@ gadgetfs_make_inode (struct super_block *sb,
>  	if (inode) {
>  		inode->i_ino = get_next_ino();
>  		inode->i_mode = mode;
> -		inode->i_uid = default_uid;
> -		inode->i_gid = default_gid;
> +		inode->i_uid = make_kuid(&init_user_ns, default_uid);
> +		inode->i_gid = make_kgid(&init_user_ns, default_gid);
>  		inode->i_atime = inode->i_mtime = inode->i_ctime
>  				= CURRENT_TIME;
>  		inode->i_private = data;
> diff --git a/init/Kconfig b/init/Kconfig
> index 60bdff2..633bde2 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -932,7 +932,6 @@ config UIDGID_CONVERTED
>  	depends on NET_9P = n
>  
>  	# Filesystems
> -	depends on USB_GADGETFS = n
>  	depends on USB_FUNCTIONFS = n
>  	depends on DEVTMPFS = n
>  	depends on XENFS = n
> -- 
> 1.7.5.4
> 

-- 
balbi

Attachment: signature.asc
Description: Digital signature