From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELuwzOys1MtOoNCrIjs6oXJQO1uExsSv7yff0ok/OdfyVXOmDtrQVHPF7c+yv1zXvNZguiqA ARC-Seal: i=1; a=rsa-sha256; t=1521483586; cv=none; d=google.com; s=arc-20160816; b=mx+ckOtkDCWVLTC0UYXGXg19WeLjKOw8t+jBvFKJy4BU3mD7eltouHkthJ79XxfT1A DVoE5aZY2Qn73FT1lQ269GArxWRp40sOvywfLZJNp57BjxBrrI8ujDYfud5txug3McQT PjeWvX9x1KlxxlwVUhexyDO4ly5SlzLw7Gvj0qvXqigiCYEtJoWRtOi8poU86K9lYs0e x87x/jXP4Cz4dMgHFARXAYNRJov1IqGNcJOkITwELfnPNVDBwJ+LoPegPrMv9wCgPB0t W8N+SPtI4F7pGzL5iV3YO9eN4ltHVUmEVn8KAZe5BO7QoNtjZXTcA9pUummiKcI7LW7R 0GEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=7MrefO+rjvN91aCxnr/Unl0xbc9Yj92wAe6ULAPmXZo=; b=OBjx3liQ+0RhWiaQLsoDSE/XRZPmSgNt54JebDrQdl4qUKxpdJjd48jQLb6JvP/yrV lS6I/hkfPuGxXCPpGlU7beTNfbvvCrUTandZnEhQ+FY7OIiDdvVeRq1Tb7hgAIXfNVio ijBqIIu9w5hzWPFn/fei02tzgCPeMVibONezUi5Gq5D8sbDBz0bnZEOIyG5/ZfLyamGN mdcY8AMJPdslp7VQhq3k+d/81p78yt1qaouftijYAQxmUux8SxAlTVvQODC1g9pGxJIu 5c07VRSxCJZWdsnyOerwYhKNOJ6Z6wFyUJxYPtVGyh6gobSDlIU/TxthxswO0b0Yusq3 f4pQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomasz Kramkowski , Benjamin Tissoires , Jiri Kosina , Sasha Levin Subject: [PATCH 4.9 043/241] HID: clamp input to logical range if no null state Date: Mon, 19 Mar 2018 19:05:08 +0100 Message-Id: <20180319180752.977991321@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1595390498609156118?= X-GMAIL-MSGID: =?utf-8?q?1595391173498147386?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tomasz Kramkowski [ Upstream commit c3883fe06488a483658ba5d849b70e49bee15e7c ] This patch fixes an issue in drivers/hid/hid-input.c where values outside of the logical range are not clamped when "null state" bit of the input control is not set. This was discussed on the lists [1] and this change stems from the fact due to the ambiguity of the HID specification it might be appropriate to follow Microsoft's own interpretation of the specification. As noted in Microsoft's documentation [2] in the section titled "Required HID usages for digitizers" it is noted that values reported outside the logical range "will be considered as invalid data and the value will be changed to the nearest boundary value (logical min/max)." This patch fixes an issue where the (1292:4745) Innomedia INNEX GENESIS/ATARI reports out of range values for its X and Y axis of the DPad which, due to the null state bit being unset, are forwarded to userspace as is. Now these values will get clamped to the logical range before being forwarded to userspace. This device was also used to test this patch. This patch expands on commit 3f3752705dbd ("HID: reject input outside logical range only if null state is set"). [1]: http://lkml.kernel.org/r/20170307131036.GA853@gaia.local [2]: https://msdn.microsoft.com/en-us/library/windows/hardware/dn672278(v=vs.85).asp Signed-off-by: Tomasz Kramkowski Acked-by: Benjamin Tissoires Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/hid/hid-input.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1149,19 +1149,26 @@ void hidinput_hid_event(struct hid_devic /* * Ignore out-of-range values as per HID specification, - * section 5.10 and 6.2.25. + * section 5.10 and 6.2.25, when NULL state bit is present. + * When it's not, clamp the value to match Microsoft's input + * driver as mentioned in "Required HID usages for digitizers": + * https://msdn.microsoft.com/en-us/library/windows/hardware/dn672278(v=vs.85).asp * * The logical_minimum < logical_maximum check is done so that we * don't unintentionally discard values sent by devices which * don't specify logical min and max. */ if ((field->flags & HID_MAIN_ITEM_VARIABLE) && - (field->flags & HID_MAIN_ITEM_NULL_STATE) && - (field->logical_minimum < field->logical_maximum) && - (value < field->logical_minimum || - value > field->logical_maximum)) { - dbg_hid("Ignoring out-of-range value %x\n", value); - return; + (field->logical_minimum < field->logical_maximum)) { + if (field->flags & HID_MAIN_ITEM_NULL_STATE && + (value < field->logical_minimum || + value > field->logical_maximum)) { + dbg_hid("Ignoring out-of-range value %x\n", value); + return; + } + value = clamp(value, + field->logical_minimum, + field->logical_maximum); } /*