aboutsummaryrefslogtreecommitdiffstats
path: root/block/genhd.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 14:43:29 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 14:43:29 -0400
commit4e4098a3e08783cfd75f9fcdab276dc1d46931da (patch)
treed0befddb4d6f999a443ef60ae8af327bed046fd5 /block/genhd.c
parentd81c8d19da8fb6514c75d5c19334f4236856c561 (diff)
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 'block/genhd.c')
-rw-r--r--block/genhd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c
index dfcec431ceea..20625eed5511 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1112,7 +1112,7 @@ struct class block_class = {
1112}; 1112};
1113 1113
1114static char *block_devnode(struct device *dev, umode_t *mode, 1114static char *block_devnode(struct device *dev, umode_t *mode,
1115 uid_t *uid, gid_t *gid) 1115 kuid_t *uid, kgid_t *gid)
1116{ 1116{
1117 struct gendisk *disk = dev_to_disk(dev); 1117 struct gendisk *disk = dev_to_disk(dev);
1118 1118