[PATCH] HID: sensor-hub: Move the memset to sensor_hub_get_feature()

[PATCH] HID: sensor-hub: Move the memset to sensor_hub_get_feature()

[Srinivas Pandruvada]

While applying patch d443a0aa3a29: "HID: hid-sensor-hub: clear memory to
avoid random data", there was some issues in applying correct version of
the patch. This resulted in the breakage of sensor functions as all
request like power-up will be reset by the memset() in the function
sensor_hub_set_feature().
The reset of caller buffer should be in the function
sensor_hub_get_feature(), not in the sensor_hub_set_feature().

Fixes: d443a0aa3a29 ("HID: hid-sensor-hub: clear memory to avoid random data")
Cc: Stable <stable@vger.kernel.org> # 4.9+
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/hid/hid-sensor-hub.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 5c92522..4ef7337 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -212,7 +212,6 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 	__s32 value;
 	int ret = 0;
 
-	memset(buffer, 0, buffer_size);
 	mutex_lock(&data->mutex);
 	report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
 	if (!report || (field_index >= report->maxfield)) {
@@ -256,6 +255,8 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 	int buffer_index = 0;
 	int i;
 
+	memset(buffer, 0, buffer_size);
+
 	mutex_lock(&data->mutex);
 	report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
 	if (!report || (field_index >= report->maxfield) ||
-- 
2.7.4

Re: [PATCH] HID: sensor-hub: Move the memset to sensor_hub_get_feature()

[Jiri Kosina]

On Tue, 27 Dec 2016, Srinivas Pandruvada wrote:

> While applying patch d443a0aa3a29: "HID: hid-sensor-hub: clear memory to
> avoid random data", there was some issues in applying correct version of
> the patch. This resulted in the breakage of sensor functions as all
> request like power-up will be reset by the memset() in the function
> sensor_hub_set_feature().
> The reset of caller buffer should be in the function
> sensor_hub_get_feature(), not in the sensor_hub_set_feature().
> 
> Fixes: d443a0aa3a29 ("HID: hid-sensor-hub: clear memory to avoid random data")
> Cc: Stable <stable@vger.kernel.org> # 4.9+
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

Applied to for-4.10/upstream-fixes, and I'll be pushing that out to Linus 
shortly. Thanks for fixing my mistake.

-- 
Jiri Kosina
SUSE Labs