Commit e4a7dca5 authored by Joey Zhang's avatar Joey Zhang Committed by Bjorn Helgaas

switchtec: Fix SWITCHTEC_IOCTL_EVENT_IDX_ALL flags overwrite

In the ioctl_event_ctl() SWITCHTEC_IOCTL_EVENT_IDX_ALL case, we call
event_ctl() several times with the same "ctl" struct.  Each call clobbers
ctl.flags, which leads to the problem that we may not actually enable or
disable all events as the user requested.

Preserve the event flag value with a temporary variable.

Fixes: 52eabba5 ("switchtec: Add IOCTLs to the Switchtec driver")
Signed-off-by: default avatarJoey Zhang <joey.zhang@microchip.com>
Signed-off-by: default avatarWesley Sheng <wesley.sheng@microchip.com>
[bhelgaas: changelog]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarLogan Gunthorpe <logang@deltatee.com>
parent aff614c6
...@@ -796,6 +796,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, ...@@ -796,6 +796,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev,
{ {
int ret; int ret;
int nr_idxs; int nr_idxs;
unsigned int event_flags;
struct switchtec_ioctl_event_ctl ctl; struct switchtec_ioctl_event_ctl ctl;
if (copy_from_user(&ctl, uctl, sizeof(ctl))) if (copy_from_user(&ctl, uctl, sizeof(ctl)))
...@@ -817,7 +818,9 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, ...@@ -817,7 +818,9 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev,
else else
return -EINVAL; return -EINVAL;
event_flags = ctl.flags;
for (ctl.index = 0; ctl.index < nr_idxs; ctl.index++) { for (ctl.index = 0; ctl.index < nr_idxs; ctl.index++) {
ctl.flags = event_flags;
ret = event_ctl(stdev, &ctl); ret = event_ctl(stdev, &ctl);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
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