From patchwork Mon Dec 28 12:48:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352686 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9800027jai; Mon, 28 Dec 2020 06:47:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwqDfXOlZeWFtTQBj/U5ZHXr47P51vScyw98raS47eBTEctERovad0/0NiX2oq2NEP8OzV4 X-Received: by 2002:a17:906:f0d0:: with SMTP id dk16mr41256373ejb.144.1609166822779; Mon, 28 Dec 2020 06:47:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609166822; cv=none; d=google.com; s=arc-20160816; b=oWda2XNC1VHFd0k9D7fnf4Wd8qxPLZQl8pjr1YVG/Rok6D0Q59RgCbHUiEkHwKp+T8 WyKEHcbzMD++pKmW12SbCsLNnHsbLWyJgbJZYzYWcZIIRxvpHyUN8zMxbiHE6QCJ/SG8 MB6NBma1+Ga6hkkXq20FSO9dZ3QsoyWGWhWxTZjJz75vjxblRaKyaiPIQdb2szsVOiy1 KRBvk4K89TsHA5RnqnnuNeJD+RGyDbchFhPqNordbI2PqE5+GZdduGQjQiFeRi1B/6p7 SzpHm0LsEKNRMkejDI/FxpSIEsWQYITigHvLBRemw2O+aZGYfgiworDv8VtGgdcvB1ko e0gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uucUfe2zCjocnN+wbSFCnhAlDVc71tqPEXLgwaeltH0=; b=E8r0IDxtym6d5oBep8AmbUGTPBawdQC+Ag5Q9LcMcV0sh4Z+BA2sjt8okeATgm74OK NWp9RSZEzM+xvIbTG1itlPFDhYjlIU6jaJp4BrhvirpToRBjnSLGSbgnC92IUHeDj1fK J5yZWYwap2Y4reHwELGsvr/FSke7PLcm7NnMFuHrX9vT2b56yfnd/wleXGoAD+Et3TwW 7qlzEAd5L2UXmz8XqDq5w9C/2+57VrYdMNG6FODkDrAuhW5blvi+VLhhQY9JkjwuoRRn DWXihJ/hQctLuHje9tSZUH4rQKO97qCk1NavW0liWCAPkjVvyKcngfBJZZ4t86G8KBEN phbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r33Qd8Jp; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f12si23136947edx.584.2020.12.28.06.47.02; Mon, 28 Dec 2020 06:47:02 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r33Qd8Jp; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503088AbgL1OYe (ORCPT + 14 others); Mon, 28 Dec 2020 09:24:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:60642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503084AbgL1OYc (ORCPT ); Mon, 28 Dec 2020 09:24:32 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7B0B2207B2; Mon, 28 Dec 2020 14:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609165432; bh=JevaJKgB0OQZVfFrtoZeKjvd2DOI6bStpsdjPtf2Kkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r33Qd8Jpxpfv7vEFanBDAl4+Mm7649uCA/WlhY6i/tQwRkbsMfdvqmHKeplnW15tY fZefDBAD0fN1Fpig/8PYfcjeQh/4pw8lLdu7PmfgGDWLyly0uGxVt1qtsSL+Evj67b td3QEI0lSRT9e4fQfBSp9RtGr9ADYJthEovvI8Qk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Dmitry Torokhov Subject: [PATCH 5.10 529/717] Input: cyapa_gen6 - fix out-of-bounds stack access Date: Mon, 28 Dec 2020 13:48:47 +0100 Message-Id: <20201228125046.313733217@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit f051ae4f6c732c231046945b36234e977f8467c6 upstream. gcc -Warray-bounds warns about a serious bug in cyapa_pip_retrieve_data_structure: drivers/input/mouse/cyapa_gen6.c: In function 'cyapa_pip_retrieve_data_structure.constprop': include/linux/unaligned/access_ok.h:40:17: warning: array subscript -1 is outside array bounds of 'struct retrieve_data_struct_cmd[1]' [-Warray-bounds] 40 | *((__le16 *)p) = cpu_to_le16(val); drivers/input/mouse/cyapa_gen6.c:569:13: note: while referencing 'cmd' 569 | } __packed cmd; | ^~~ Apparently the '-2' was added to the pointer instead of the value, writing garbage into the stack next to this variable. Fixes: c2c06c41f700 ("Input: cyapa - add gen6 device module support") Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20201026161332.3708389-1-arnd@kernel.org Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/mouse/cyapa_gen6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/input/mouse/cyapa_gen6.c +++ b/drivers/input/mouse/cyapa_gen6.c @@ -573,7 +573,7 @@ static int cyapa_pip_retrieve_data_struc memset(&cmd, 0, sizeof(cmd)); put_unaligned_le16(PIP_OUTPUT_REPORT_ADDR, &cmd.head.addr); - put_unaligned_le16(sizeof(cmd), &cmd.head.length - 2); + put_unaligned_le16(sizeof(cmd) - 2, &cmd.head.length); cmd.head.report_id = PIP_APP_CMD_REPORT_ID; cmd.head.cmd_code = PIP_RETRIEVE_DATA_STRUCTURE; put_unaligned_le16(read_offset, &cmd.read_offset);