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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43009C433FE for ; Thu, 13 Oct 2022 00:38:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232133AbiJMAiQ (ORCPT ); Wed, 12 Oct 2022 20:38:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232158AbiJMAeS (ORCPT ); Wed, 12 Oct 2022 20:34:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDC0B57E24; Wed, 12 Oct 2022 17:29:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E1B1C616E3; Thu, 13 Oct 2022 00:27:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F6FEC433B5; Thu, 13 Oct 2022 00:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665620877; bh=GlxaIfTe2cbL0wzvJCYu/yb+Dzwdt/fPXLrbYdgTPUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g5Fo+El1DgFTu69eVXJn0JDW/9SYoh7GlSFZRDb6ZeoKl7FN5p05laPZUdIvrdCBX ++TFga2yEt5YFksZjCiteljLShxFql3L2Bhzd022xAa9OCOgenseI7FxdOenHH0CPs 7HPqS61kuPI/egtOTJzwSCI+9bKBMkL+kXBf4On6dFXiIjiSGTasHlVqc12gRvozvD mcHBMoL9x1rHWZeI2ws54SkkMOXfxNsNbFYRZwCKalRRRQx6PmV3yBh64LgDVVE6uJ 8q+E5GQ37n58g0OiIzO05XNMBOVtWg+dLXDcRPRe+v6TEeSvaui+LyMv2WxA83Xd0Q 1uhkn4RMxLY6A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dongliang Mu , syzbot+79832d33eb89fb3cd092@syzkaller.appspotmail.com, Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 13/13] usb: idmouse: fix an uninit-value in idmouse_open Date: Wed, 12 Oct 2022 20:27:12 -0400 Message-Id: <20221013002716.1895839-13-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221013002716.1895839-1-sashal@kernel.org> References: <20221013002716.1895839-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dongliang Mu [ Upstream commit bce2b0539933e485d22d6f6f076c0fcd6f185c4c ] In idmouse_create_image, if any ftip_command fails, it will go to the reset label. However, this leads to the data in bulk_in_buffer[HEADER..IMGSIZE] uninitialized. And the check for valid image incurs an uninitialized dereference. Fix this by moving the check before reset label since this check only be valid if the data after bulk_in_buffer[HEADER] has concrete data. Note that this is found by KMSAN, so only kernel compilation is tested. Reported-by: syzbot+79832d33eb89fb3cd092@syzkaller.appspotmail.com Signed-off-by: Dongliang Mu Link: https://lore.kernel.org/r/20220922134847.1101921-1-dzm91@hust.edu.cn Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/misc/idmouse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index 01ef2551be46..974b8d0621bd 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c @@ -182,10 +182,6 @@ static int idmouse_create_image(struct usb_idmouse *dev) bytes_read += bulk_read; } - /* reset the device */ -reset: - ftip_command(dev, FTIP_RELEASE, 0, 0); - /* check for valid image */ /* right border should be black (0x00) */ for (bytes_read = sizeof(HEADER)-1 + WIDTH-1; bytes_read < IMGSIZE; bytes_read += WIDTH) @@ -197,6 +193,10 @@ static int idmouse_create_image(struct usb_idmouse *dev) if (dev->bulk_in_buffer[bytes_read] != 0xFF) return -EAGAIN; + /* reset the device */ +reset: + ftip_command(dev, FTIP_RELEASE, 0, 0); + /* should be IMGSIZE == 65040 */ dev_dbg(&dev->interface->dev, "read %d bytes fingerprint data\n", bytes_read); -- 2.35.1