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 A567BC7EE31 for ; Thu, 25 May 2023 18:41:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242210AbjEYSlz (ORCPT ); Thu, 25 May 2023 14:41:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242597AbjEYSku (ORCPT ); Thu, 25 May 2023 14:40:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1213410C7; Thu, 25 May 2023 11:38:25 -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 CEE77648DB; Thu, 25 May 2023 18:37:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2B92C433EF; Thu, 25 May 2023 18:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685039833; bh=NTj2dnuzZlrai10DandPf5T/CG0CTRvG2Jxpu7+VtRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TlFgiEuwzapQcj/NqXSGe8mAxp8ohOyYDgBtIJFXEFONkQdytW/rI+vyOGmzM0q8b 3NU0thlHxmT1l5wo86gbJGlZqCS9Ihq0Uz6zL7qgelbL5TK+sBil/e6KTMtTWDYjIW YCi1iQdAosB6t9GKzRJ3lkkxZqv94VGuUxpWpvQ2/QqREGp4giWoCHIUAjW8LtigW+ IC+Wvg1W3yl2CKays4O0+ZDHW4P/6yx9IpeXKq3RYuW7LrFDqsR9Q2y/VIPH1rwkil Ipm+mTcQc4EjBR898yX7RHUfJO4iDE6Uth922q2GoosBrGCF1giC/OD3zXwIROvQc1 1Es9mOWZu2nxw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Chen , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 17/57] media: dvb-usb: dw2102: fix uninit-value in su3000_read_mac_address Date: Thu, 25 May 2023 14:35:27 -0400 Message-Id: <20230525183607.1793983-17-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230525183607.1793983-1-sashal@kernel.org> References: <20230525183607.1793983-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: Wei Chen [ Upstream commit a3fd1ef27aa686d871cefe207bd6168c4b0cd29e ] In su3000_read_mac_address, if i2c_transfer fails to execute two messages, array mac address will not be initialized. Without handling such error, later in function dvb_usb_adapter_dvb_init, proposed_mac is accessed before initialization. Fix this error by returning a negative value if message execution fails. Link: https://lore.kernel.org/linux-media/20230328124416.560889-1-harperchen1110@gmail.com Signed-off-by: Wei Chen Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/dvb-usb/dw2102.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c index 0ca764282c767..8747960e61461 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c @@ -946,7 +946,7 @@ static int su3000_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) for (i = 0; i < 6; i++) { obuf[1] = 0xf0 + i; if (i2c_transfer(&d->i2c_adap, msg, 2) != 2) - break; + return -1; else mac[i] = ibuf[0]; } -- 2.39.2