soc: qcom: rmtfs-mem: Support non-root rmtfs daemons
Subsystems (2)
cover soc: qcom: rmtfs-mem: Support non-root rmtfs daemons
This series contains minor fixes needed to better support running an rmtfs daemon from an unprivileged process:
- Enable uevents on the child character device by adding a struct
class to the parent. I needed these so that I could change the ownership of /dev/qcom_rmtfs_mem1, and drove myself crazy trying to understand why my udev rules never fired.
- Enable access to phys_addr and size sysfs attributes. The daemon
needs to read these, and they don't really contain anything sensitive, so expose them.
I still need CAP_NET_ADMIN to be able to bind to the right qrtr port, but at least with these changes I can run as a different user, and drop all other privileges.
Evan Green (2):
soc: qcom: rmtfs-mem: Add class to enable uevents
soc: qcom: rmtfs-mem: Make sysfs attributes world-readable
drivers/soc/qcom/rmtfs_mem.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
Signature · 1 line
2.18.1
PATCH 1/2 soc: qcom: rmtfs-mem: Add class to enable uevents
Currently the qcom_rmtfs_memN devices are entirely invisible to the udev world. Add a class to the rmtfs device so that uevents fire when the device is added.
---
drivers/soc/qcom/rmtfs_mem.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/soc/qcom/rmtfs_mem.c +18 -5
@@ -132,6 +132,11 @@ static int qcom_rmtfs_mem_release(struct inode *inode, struct file *filp)return 0 ; } +static struct class rmtfs_class = { + .owner =THIS_MODULE , + .name ="rmtfs" , +}; +static const struct file_operations qcom_rmtfs_mem_fops = { .owner =THIS_MODULE , .open = qcom_rmtfs_mem_open,
@@ -173,9 +178,15 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev) } + ret =class_register (&rmtfs_class); +if (ret) +return ret; + rmtfs_mem =kzalloc (sizeof (*rmtfs_mem),GFP_KERNEL ); -if (!rmtfs_mem) -return -ENOMEM ; +if (!rmtfs_mem) { + ret = -ENOMEM ; + goto unregister_class; + } rmtfs_mem->addr = rmem->base; rmtfs_mem->client_id = client_id;
@@ -199,8 +210,8 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)dev_set_name (&rmtfs_mem->dev,"qcom_rmtfs_mem%d" , client_id); rmtfs_mem->dev.id = client_id; + rmtfs_mem->dev.class = &rmtfs_class; rmtfs_mem->dev.devt =MKDEV (MAJOR (qcom_rmtfs_mem_major), client_id); - ret =cdev_device_add (&rmtfs_mem->cdev, &rmtfs_mem->dev);if (ret) {dev_err (&pdev->dev,"failed to add cdev: %d\n" , ret);
@@ -235,11 +246,13 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)return 0 ; + remove_cdev:cdev_device_del (&rmtfs_mem->cdev, &rmtfs_mem->dev); put_device:put_device (&rmtfs_mem->dev); - +unregister_class: +class_unregister (&rmtfs_class);return ret; }
@@ -258,7 +271,7 @@ static int qcom_rmtfs_mem_remove(struct platform_device *pdev)cdev_device_del (&rmtfs_mem->cdev, &rmtfs_mem->dev);put_device (&rmtfs_mem->dev); - +class_unregister (&rmtfs_class);return 0 ; }
Signature · 1 line
2.18.1
Re: [PATCH v1 1/2] soc: qcom: rmtfs-mem: Add class to enable uevents
Hi Evan,
Quoted 26 lines · Evan Green
Currently the
qcom_rmtfs_memNdevices are entirely invisible to the udev world. Add a class to the rmtfs device so that uevents fire when the device is added.Signed-off-by Evan Green <[email protected]>---
drivers/soc/qcom/rmtfs_mem.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)drivers/soc/qcom/rmtfs_mem.c +5
-0@@ -132,6 +132,11 @@ static int qcom_rmtfs_mem_release(struct inode *inode, struct file *filp)return 0 ; } +static struct class rmtfs_class = { + .owner =THIS_MODULE , + .name ="rmtfs" , +}; +static const struct file_operations qcom_rmtfs_mem_fops = { .owner =THIS_MODULE , .open = qcom_rmtfs_mem_open,
drivers/soc/qcom/rmtfs_mem.c static int qcom_rmtfs_mem_probe(struct platform_device *pdev) · line 183
Quoted 6 lines
drivers/soc/qcom/rmtfs_mem.c +3
-0@@ -173,9 +178,15 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev) } + ret =class_register (&rmtfs_class); +if (ret) +return ret;
Hmm, is this how classes are supposed to work? Usually, you have the possibility of more than 1 device per class, and therefore you don't register the class in the driver probe -- you register it in the init() routine, or something similar. As it is, I expect this will break if there were ever a second rmtfs device.
Brian
Quoted 48 lines
drivers/soc/qcom/rmtfs_mem.c +10
-5+ rmtfs_mem =kzalloc (sizeof (*rmtfs_mem),GFP_KERNEL ); -if (!rmtfs_mem) -return -ENOMEM ; +if (!rmtfs_mem) { + ret = -ENOMEM ; + goto unregister_class; + } rmtfs_mem->addr = rmem->base; rmtfs_mem->client_id = client_id;@@ -199,8 +210,8 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)dev_set_name (&rmtfs_mem->dev,"qcom_rmtfs_mem%d" , client_id); rmtfs_mem->dev.id = client_id; + rmtfs_mem->dev.class = &rmtfs_class; rmtfs_mem->dev.devt =MKDEV (MAJOR (qcom_rmtfs_mem_major), client_id); - ret =cdev_device_add (&rmtfs_mem->cdev, &rmtfs_mem->dev);if (ret) {dev_err (&pdev->dev,"failed to add cdev: %d\n" , ret);@@ -235,11 +246,13 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)return 0 ; + remove_cdev:cdev_device_del (&rmtfs_mem->cdev, &rmtfs_mem->dev); put_device:put_device (&rmtfs_mem->dev); - +unregister_class: +class_unregister (&rmtfs_class);return ret; }@@ -258,7 +271,7 @@ static int qcom_rmtfs_mem_remove(struct platform_device *pdev)cdev_device_del (&rmtfs_mem->cdev, &rmtfs_mem->dev);put_device (&rmtfs_mem->dev); - +class_unregister (&rmtfs_class);return 0 ; }Signature · 1 line
2.18.1
Re: [PATCH v1 1/2] soc: qcom: rmtfs-mem: Add class to enable uevents
Quoted 33 lines · Brian Norris
Hi Evan,
Quoted 29 lines · Evan Green
Currently the
qcom_rmtfs_memNdevices are entirely invisible to the udev world. Add a class to the rmtfs device so that uevents fire when the device is added.Signed-off-by Evan Green <[email protected]>---
drivers/soc/qcom/rmtfs_mem.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)drivers/soc/qcom/rmtfs_mem.c +5
-0@@ -132,6 +132,11 @@ static int qcom_rmtfs_mem_release(struct inode *inode, struct file *filp)return 0 ; } +static struct class rmtfs_class = { + .owner =THIS_MODULE , + .name ="rmtfs" , +}; +static const struct file_operations qcom_rmtfs_mem_fops = { .owner =THIS_MODULE , .open = qcom_rmtfs_mem_open,@@ -173,9 +178,15 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev) }
Quoted 10 lines
drivers/soc/qcom/rmtfs_mem.c static int qcom_rmtfs_mem_probe(struct platform_device *pdev) · line 183
Quoted 3 lines
drivers/soc/qcom/rmtfs_mem.c +3
-0+ ret =class_register (&rmtfs_class); +if (ret) +return ret;Hmm, is this how classes are supposed to work? Usually, you have the possibility of more than 1 device per class, and therefore you don't register the class in the driver probe -- you register it in the
init()routine, or something similar. As it is, I expect this will break if there were ever a second rmtfs device.
Fair enough. I'll move this to an init routine.
PATCH 2/2 soc: qcom: rmtfs-mem: Make sysfs attributes world-readable
In reply to Evan GreenIn order to run an rmtfs daemon as an unprivileged user, that user would need access to the phys_addr and size sysfs attributes. Sharing these attributes with unprivileged users doesn't really leak anything sensitive, since if you have access to physical memory, the jig is up anyway.
Make those attributes readable by all.
---
drivers/soc/qcom/rmtfs_mem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/soc/qcom/rmtfs_mem.c +3 -3
@@ -45,9 +45,9 @@ static ssize_t qcom_rmtfs_mem_show(struct device *dev,struct device_attribute *attr, char *buf); -static DEVICE_ATTR(phys_addr, 0400, qcom_rmtfs_mem_show, NULL); -static DEVICE_ATTR(size, 0400, qcom_rmtfs_mem_show, NULL); -static DEVICE_ATTR(client_id, 0400, qcom_rmtfs_mem_show, NULL); +static DEVICE_ATTR(phys_addr, 0444, qcom_rmtfs_mem_show, NULL); +static DEVICE_ATTR(size, 0444, qcom_rmtfs_mem_show, NULL); +static DEVICE_ATTR(client_id, 0444, qcom_rmtfs_mem_show, NULL); static ssize_t qcom_rmtfs_mem_show(struct device *dev, struct device_attribute *attr,
Signature · 1 line
2.18.1
Re: [PATCH v1 2/2] soc: qcom: rmtfs-mem: Make sysfs attributes world-readable
Quoted 10 lines · Evan Green
In order to run an rmtfs daemon as an unprivileged user, that user would need access to the
phys_addrand size sysfs attributes. Sharing these attributes with unprivileged users doesn't really leak anything sensitive, since if you have access to physical memory, the jig is up anyway.Make those attributes readable by all.
Signed-off-by Evan Green <[email protected]>---
Seems fine to me.
Quoted 24 lines
drivers/soc/qcom/rmtfs_mem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/soc/qcom/rmtfs_mem.c +3
-3@@ -45,9 +45,9 @@ static ssize_t qcom_rmtfs_mem_show(struct device *dev,struct device_attribute *attr, char *buf); -static DEVICE_ATTR(phys_addr, 0400, qcom_rmtfs_mem_show, NULL); -static DEVICE_ATTR(size, 0400, qcom_rmtfs_mem_show, NULL); -static DEVICE_ATTR(client_id, 0400, qcom_rmtfs_mem_show, NULL); +static DEVICE_ATTR(phys_addr, 0444, qcom_rmtfs_mem_show, NULL); +static DEVICE_ATTR(size, 0444, qcom_rmtfs_mem_show, NULL); +static DEVICE_ATTR(client_id, 0444, qcom_rmtfs_mem_show, NULL); static ssize_t qcom_rmtfs_mem_show(struct device *dev, struct device_attribute *attr,Signature · 1 line
2.18.1