summaryrefslogtreecommitdiff
path: root/drivers/usb/core/usb.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 11:43:29 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 11:43:29 -0700
commit4e4098a3e08783cfd75f9fcdab276dc1d46931da (patch)
treed0befddb4d6f999a443ef60ae8af327bed046fd5 /drivers/usb/core/usb.c
parentd81c8d19da8fb6514c75d5c19334f4236856c561 (diff)
downloadkernel-common-4e4098a3e08783cfd75f9fcdab276dc1d46931da.tar.gz
kernel-common-4e4098a3e08783cfd75f9fcdab276dc1d46931da.tar.bz2
kernel-common-4e4098a3e08783cfd75f9fcdab276dc1d46931da.zip
driver core: handle user namespaces properly with the uid/gid devtmpfs change
Now that devtmpfs is caring about uid/gid, we need to use the correct internal types so users who have USER_NS enabled will have things work properly for them. Thanks to Eric for pointing this out, and the patch review. Reported-by: Eric W. Biederman <ebiederm@xmission.com> Cc: Kay Sievers <kay@vrfy.org> Cc: Ming Lei <ming.lei@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/usb.c')
-rw-r--r--drivers/usb/core/usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 17002832abd9..e092b414dc50 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -318,7 +318,7 @@ static const struct dev_pm_ops usb_device_pm_ops = {
static char *usb_devnode(struct device *dev,
- umode_t *mode, uid_t *uid, gid_t *gid)
+ umode_t *mode, kuid_t *uid, kgid_t *gid)
{
struct usb_device *usb_dev;