mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Driver-Core: extend devnode callbacks to provide permissions
This allows subsytems to provide devtmpfs with non-default permissions for the device node. Instead of the default mode of 0600, null, zero, random, urandom, full, tty, ptmx now have a mode of 0666, which allows non-privileged processes to access standard device nodes in case no other userspace process applies the expected permissions. This also fixes a wrong assignment in pktcdvd and a checkpatch.pl complain. Signed-off-by: Kay Sievers <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
78f28b7c55
commit
e454cea20b
30 changed files with 116 additions and 79 deletions
|
|
@ -1057,14 +1057,14 @@ static const struct file_operations usblp_fops = {
|
|||
.release = usblp_release,
|
||||
};
|
||||
|
||||
static char *usblp_nodename(struct device *dev)
|
||||
static char *usblp_devnode(struct device *dev, mode_t *mode)
|
||||
{
|
||||
return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
|
||||
}
|
||||
|
||||
static struct usb_class_driver usblp_class = {
|
||||
.name = "lp%d",
|
||||
.nodename = usblp_nodename,
|
||||
.devnode = usblp_devnode,
|
||||
.fops = &usblp_fops,
|
||||
.minor_base = USBLP_MINOR_BASE,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -67,14 +67,14 @@ static struct usb_class {
|
|||
struct class *class;
|
||||
} *usb_class;
|
||||
|
||||
static char *usb_nodename(struct device *dev)
|
||||
static char *usb_devnode(struct device *dev, mode_t *mode)
|
||||
{
|
||||
struct usb_class_driver *drv;
|
||||
|
||||
drv = dev_get_drvdata(dev);
|
||||
if (!drv || !drv->nodename)
|
||||
if (!drv || !drv->devnode)
|
||||
return NULL;
|
||||
return drv->nodename(dev);
|
||||
return drv->devnode(dev, mode);
|
||||
}
|
||||
|
||||
static int init_usb_class(void)
|
||||
|
|
@ -100,7 +100,7 @@ static int init_usb_class(void)
|
|||
kfree(usb_class);
|
||||
usb_class = NULL;
|
||||
}
|
||||
usb_class->class->nodename = usb_nodename;
|
||||
usb_class->class->devnode = usb_devnode;
|
||||
|
||||
exit:
|
||||
return result;
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ static struct dev_pm_ops usb_device_pm_ops = {
|
|||
#endif /* CONFIG_PM */
|
||||
|
||||
|
||||
static char *usb_nodename(struct device *dev)
|
||||
static char *usb_devnode(struct device *dev, mode_t *mode)
|
||||
{
|
||||
struct usb_device *usb_dev;
|
||||
|
||||
|
|
@ -324,7 +324,7 @@ struct device_type usb_device_type = {
|
|||
.name = "usb_device",
|
||||
.release = usb_release_dev,
|
||||
.uevent = usb_dev_uevent,
|
||||
.nodename = usb_nodename,
|
||||
.devnode = usb_devnode,
|
||||
.pm = &usb_device_pm_ops,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -727,7 +727,7 @@ static const struct file_operations iowarrior_fops = {
|
|||
.poll = iowarrior_poll,
|
||||
};
|
||||
|
||||
static char *iowarrior_nodename(struct device *dev)
|
||||
static char *iowarrior_devnode(struct device *dev, mode_t *mode)
|
||||
{
|
||||
return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
|
||||
}
|
||||
|
|
@ -738,7 +738,7 @@ static char *iowarrior_nodename(struct device *dev)
|
|||
*/
|
||||
static struct usb_class_driver iowarrior_class = {
|
||||
.name = "iowarrior%d",
|
||||
.nodename = iowarrior_nodename,
|
||||
.devnode = iowarrior_devnode,
|
||||
.fops = &iowarrior_fops,
|
||||
.minor_base = IOWARRIOR_MINOR_BASE,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ static const struct file_operations tower_fops = {
|
|||
.llseek = tower_llseek,
|
||||
};
|
||||
|
||||
static char *legousbtower_nodename(struct device *dev)
|
||||
static char *legousbtower_devnode(struct device *dev, mode_t *mode)
|
||||
{
|
||||
return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
|
||||
}
|
||||
|
|
@ -277,7 +277,7 @@ static char *legousbtower_nodename(struct device *dev)
|
|||
*/
|
||||
static struct usb_class_driver tower_class = {
|
||||
.name = "legousbtower%d",
|
||||
.nodename = legousbtower_nodename,
|
||||
.devnode = legousbtower_devnode,
|
||||
.fops = &tower_fops,
|
||||
.minor_base = LEGO_USB_TOWER_MINOR_BASE,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue