| Message ID | 20210415185232.2617398-2-srinivas.pandruvada@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | [1/2] HID: hid-sensor-hub: Return error for hid_set_field() failure | expand |
On Thu, 15 Apr 2021, Srinivas Pandruvada wrote: > When user modifies a custom feature value and sensor_hub_set_feature() > fails, return error. > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > --- > Replaces patch: HID: hid-sensor-custom: remove useless variable > by Jiapeng Chong <jiapeng.chong@linux.alibaba.com> > > drivers/hid/hid-sensor-custom.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c > index 2628bc53ed80..58b54b127cdf 100644 > --- a/drivers/hid/hid-sensor-custom.c > +++ b/drivers/hid/hid-sensor-custom.c > @@ -406,6 +406,8 @@ static ssize_t store_value(struct device *dev, struct device_attribute *attr, > report_id; > ret = sensor_hub_set_feature(sensor_inst->hsdev, report_id, > index, sizeof(value), &value); > + if (ret) > + return ret; What tree is this patch against? In my tree, we're not even assigning sensor_hub_set_feature() return value to anything.
On Wed, May 5, 2021 at 2:38 PM Jiri Kosina <jikos@kernel.org> wrote: > > On Thu, 15 Apr 2021, Srinivas Pandruvada wrote: > > > When user modifies a custom feature value and sensor_hub_set_feature() > > fails, return error. > > > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > > --- > > Replaces patch: HID: hid-sensor-custom: remove useless variable > > by Jiapeng Chong <jiapeng.chong@linux.alibaba.com> > > > > drivers/hid/hid-sensor-custom.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c > > index 2628bc53ed80..58b54b127cdf 100644 > > --- a/drivers/hid/hid-sensor-custom.c > > +++ b/drivers/hid/hid-sensor-custom.c > > @@ -406,6 +406,8 @@ static ssize_t store_value(struct device *dev, struct device_attribute *attr, > > report_id; > > ret = sensor_hub_set_feature(sensor_inst->hsdev, report_id, > > index, sizeof(value), &value); > > + if (ret) > > + return ret; > > What tree is this patch against? In my tree, we're not even assigning > sensor_hub_set_feature() return value to anything. > I guess there was a "collision". At roughly the same time I merged https://patchwork.kernel.org/project/linux-input/list/?series=456269 people were starting to send various patches for the same thing. Srinivas, either the change in for-next (and probably Linus' master now) is fine, or could you rebase on top of hid.git? Cheers, Benjamin
Hi Benjamin, On Wed, 2021-05-05 at 15:28 +0200, Benjamin Tissoires wrote: > On Wed, May 5, 2021 at 2:38 PM Jiri Kosina <jikos@kernel.org> wrote: > > > > On Thu, 15 Apr 2021, Srinivas Pandruvada wrote: > > > > > When user modifies a custom feature value and > > > sensor_hub_set_feature() > > > fails, return error. > > > > > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > > > Signed-off-by: Srinivas Pandruvada < > > > srinivas.pandruvada@linux.intel.com> > > > --- > > > Replaces patch: HID: hid-sensor-custom: remove useless variable > > > by Jiapeng Chong <jiapeng.chong@linux.alibaba.com> > > > > > > drivers/hid/hid-sensor-custom.c | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid- > > > sensor-custom.c > > > index 2628bc53ed80..58b54b127cdf 100644 > > > --- a/drivers/hid/hid-sensor-custom.c > > > +++ b/drivers/hid/hid-sensor-custom.c > > > @@ -406,6 +406,8 @@ static ssize_t store_value(struct device > > > *dev, struct device_attribute *attr, > > > > > > report_id; > > > ret = sensor_hub_set_feature(sensor_inst->hsdev, > > > report_id, > > > index, sizeof(value), > > > &value); > > > + if (ret) > > > + return ret; > > > > What tree is this patch against? In my tree, we're not even > > assigning > > sensor_hub_set_feature() return value to anything. > > > > I guess there was a "collision". At roughly the same time I merged > https://patchwork.kernel.org/project/linux-input/list/?series=456269 > people were starting to send various patches for the same thing. > > Srinivas, either the change in for-next (and probably Linus' master > now) is fine, or could you rebase on top of hid.git? > Rebased and attached based on top of the latest mainline. Thanks, Srinivas > Cheers, > Benjamin >
On Thu, 6 May 2021, Pandruvada, Srinivas wrote:
> Rebased and attached based on top of the latest mainline.
Applied, thanks.
diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c index 2628bc53ed80..58b54b127cdf 100644 --- a/drivers/hid/hid-sensor-custom.c +++ b/drivers/hid/hid-sensor-custom.c @@ -406,6 +406,8 @@ static ssize_t store_value(struct device *dev, struct device_attribute *attr, report_id; ret = sensor_hub_set_feature(sensor_inst->hsdev, report_id, index, sizeof(value), &value); + if (ret) + return ret; } else return -EINVAL;
When user modifies a custom feature value and sensor_hub_set_feature() fails, return error. Reported-by: Abaci Robot <abaci@linux.alibaba.com> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> --- Replaces patch: HID: hid-sensor-custom: remove useless variable by Jiapeng Chong <jiapeng.chong@linux.alibaba.com> drivers/hid/hid-sensor-custom.c | 2 ++ 1 file changed, 2 insertions(+)