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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 99E65C3F2D1 for ; Thu, 5 Mar 2020 17:17:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 659EE207FD for ; Thu, 5 Mar 2020 17:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428676; bh=dWLOOtgs8r0BCpXxpbJ3caJNYAxwdp5YiDEViJrweIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cnHlACeANiulofowdeZgHfF/KAVdHNPQM3XeTut0joAPAdBH2XVK7BUPWJb9RsAJQ 0BAuf8D9qAh2qQlNkq0fKGUgBF9YtO2TmzHlXu4j+1Xdnrv98VIf2vdfK/Sztv46v2 gP7lH1kVTW1s75GVYccIBOX5NIU8/qs9OWKvjpvM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727707AbgCERRy (ORCPT ); Thu, 5 Mar 2020 12:17:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:42592 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728228AbgCERPp (ORCPT ); Thu, 5 Mar 2020 12:15:45 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 44A3220848; Thu, 5 Mar 2020 17:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428545; bh=dWLOOtgs8r0BCpXxpbJ3caJNYAxwdp5YiDEViJrweIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dd0uiytXYLPBTg8QTD1NeQZRNmx84WFVttz8wv7GKG2RSXK0+p4f+/Y9+XAQaErBO GXWICnIuUBZtKdPm3F0IWwIwQftRDA85Cw59grmRWrZqaMZvdBqRPseNsVCYfnulW7 Sh1IyBRcyrZ+mlsZ/MfbVmUOx3Svr75xmDyLKIU4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Korsnes , Armando Visconti , Jiri Kosina , Alan Stern , Sasha Levin , linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 03/19] HID: core: fix off-by-one memset in hid_report_raw_event() Date: Thu, 5 Mar 2020 12:15:24 -0500 Message-Id: <20200305171540.30250-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200305171540.30250-1-sashal@kernel.org> References: <20200305171540.30250-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Korsnes [ Upstream commit 5ebdffd25098898aff1249ae2f7dbfddd76d8f8f ] In case a report is greater than HID_MAX_BUFFER_SIZE, it is truncated, but the report-number byte is not correctly handled. This results in a off-by-one in the following memset, causing a kernel Oops and ensuing system crash. Note: With commit 8ec321e96e05 ("HID: Fix slab-out-of-bounds read in hid_field_extract") I no longer hit the kernel Oops as we instead fail "controlled" at probe if there is a report too long in the HID report-descriptor. hid_report_raw_event() is an exported symbol, so presumabely we cannot always rely on this being the case. Fixes: 966922f26c7f ("HID: fix a crash in hid_report_raw_event() function.") Signed-off-by: Johan Korsnes Cc: Armando Visconti Cc: Jiri Kosina Cc: Alan Stern Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 2d089d3954e38..75b0a337114df 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1567,7 +1567,9 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size, rsize = ((report->size - 1) >> 3) + 1; - if (rsize > HID_MAX_BUFFER_SIZE) + if (report_enum->numbered && rsize >= HID_MAX_BUFFER_SIZE) + rsize = HID_MAX_BUFFER_SIZE - 1; + else if (rsize > HID_MAX_BUFFER_SIZE) rsize = HID_MAX_BUFFER_SIZE; if (csize < rsize) { -- 2.20.1