Commit 748a7295 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by David S. Miller

net: netxen: correct sysfs bin attribute return code

If read() syscall requests unexpected number of bytes from "dimm" binary
attribute file, return EINVAL instead of EPERM.

At the same time pin down sysfs file size to the fixed
sizeof(struct netxen_dimm_cfg), which allows to exploit some missing
sanity checks from kernfs (file boundary checks vs offset etc.)
Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 082739aa
...@@ -3025,9 +3025,9 @@ netxen_sysfs_read_dimm(struct file *filp, struct kobject *kobj, ...@@ -3025,9 +3025,9 @@ netxen_sysfs_read_dimm(struct file *filp, struct kobject *kobj,
u8 dw, rows, cols, banks, ranks; u8 dw, rows, cols, banks, ranks;
u32 val; u32 val;
if (size != sizeof(struct netxen_dimm_cfg)) { if (size < attr->size) {
netdev_err(netdev, "Invalid size\n"); netdev_err(netdev, "Invalid size\n");
return -1; return -EINVAL;
} }
memset(&dimm, 0, sizeof(struct netxen_dimm_cfg)); memset(&dimm, 0, sizeof(struct netxen_dimm_cfg));
...@@ -3137,7 +3137,7 @@ netxen_sysfs_read_dimm(struct file *filp, struct kobject *kobj, ...@@ -3137,7 +3137,7 @@ netxen_sysfs_read_dimm(struct file *filp, struct kobject *kobj,
static struct bin_attribute bin_attr_dimm = { static struct bin_attribute bin_attr_dimm = {
.attr = { .name = "dimm", .mode = (S_IRUGO | S_IWUSR) }, .attr = { .name = "dimm", .mode = (S_IRUGO | S_IWUSR) },
.size = 0, .size = sizeof(struct netxen_dimm_cfg),
.read = netxen_sysfs_read_dimm, .read = netxen_sysfs_read_dimm,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment