From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D15A9C04A6B for ; Mon, 6 May 2019 15:09:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97EC32087F for ; Mon, 6 May 2019 15:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557155371; bh=ficshpO8Shqw6Abdhvok6FU9UFWIkLTXgtO1J+kYecU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YM9w+vdwHXsoPwLGkQZnfWC9gvPF+EFzh9rA6ALg49s5yEodQapI1eAqy6CX7nL2I SagdZSWBYDAUN7rqvVrkTkxF4A28NxONADcZvRaIFUZDwoxRt383ocsV7dWwVuqmEh xc9FhTdo1cDOOzn38P/V3wqVKqa0FQQbmm+itSU8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726943AbfEFOfa (ORCPT ); Mon, 6 May 2019 10:35:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:55578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726373AbfEFOf3 (ORCPT ); Mon, 6 May 2019 10:35:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8506021530; Mon, 6 May 2019 14:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153328; bh=ficshpO8Shqw6Abdhvok6FU9UFWIkLTXgtO1J+kYecU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P7BPkkfIutkqgi7CsZ8bKjJfc0pE4zWRZ/nau/CWZJ9yv7LxuDNYGKgr/qC/xGE7d G8gXOPWg9bi89cWWLY4e3ipC+4ZSwl9JdcWhf0IOh3U/IxvAGgPMY8tyCpLuAuwNZS u2hXxsjcYo/zOuKCyZTsMsRFiESLcynXolI3mGtk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , Jiri Kosina , "Sasha Levin (Microsoft)" Subject: [PATCH 5.0 026/122] HID: Increase maximum report size allowed by hid_field_extract() Date: Mon, 6 May 2019 16:31:24 +0200 Message-Id: <20190506143057.104585809@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143054.670334917@linuxfoundation.org> References: <20190506143054.670334917@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 94a9992f7dbdfb28976b565af220e0c4a117144a ] Commit 71f6fa90a353 ("HID: increase maximum global item tag report size to 256") increases the max report size from 128 to 256. We also need to update the report size in hid_field_extract() otherwise it complains and truncates now valid report size: [ 406.165461] hid-sensor-hub 001F:8086:22D8.0002: hid_field_extract() called with n (192) > 32! (kworker/5:1) BugLink: https://bugs.launchpad.net/bugs/1818547 Fixes: 71f6fa90a353 ("HID: increase maximum global item tag report size to 256") Signed-off-by: Kai-Heng Feng Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin (Microsoft) --- drivers/hid/hid-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 9993b692598f..860e21ec6a49 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1301,10 +1301,10 @@ static u32 __extract(u8 *report, unsigned offset, int n) u32 hid_field_extract(const struct hid_device *hid, u8 *report, unsigned offset, unsigned n) { - if (n > 32) { - hid_warn(hid, "hid_field_extract() called with n (%d) > 32! (%s)\n", + if (n > 256) { + hid_warn(hid, "hid_field_extract() called with n (%d) > 256! (%s)\n", n, current->comm); - n = 32; + n = 256; } return __extract(report, offset, n); -- 2.20.1