Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp805013pxb; Tue, 12 Apr 2022 13:57:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzK7yWWYAmN6KBEfRjRudgwjHUWSyqcTK2i/VXBYA8aqRyWc7JY1OiMO4CZaefg1k0Ynu6f X-Received: by 2002:a17:903:31d5:b0:158:27f4:fc9f with SMTP id v21-20020a17090331d500b0015827f4fc9fmr22450839ple.60.1649797063944; Tue, 12 Apr 2022 13:57:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649797063; cv=none; d=google.com; s=arc-20160816; b=Q7tJGz96MrLOKGlA8nbeHuoqZtCM2UB5VIHpGr2wQkcT04x1ozYkCcW+wME49uNqEU LVbeifVdF+OWJ4A2oAXGFporWReaA91JOMSQi0R4qR+1wlzfRES4/QfX7ORijSfmhS53 CyieH0GfBCgLIG4qdsaUxFLXh2+0UbShnmspYjL4p6v/4MuQw1E4VaHy9ymVbNiSJIin H7UohFgmJpYXUW1dVw1MHs2KXsvWxgAvh+8l0NpyFCAvhXsnUR8LiAJ0PK+95lealbDy LNR04SIgl8CwfiziCJpurtV7dqgkOwF319nZLGa96syaSVgbT7ytqAXnHpIDNE41z+CO 5ozw== 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=gRvdeXwvBDEsTSWaVYVWn++kIphvZQyYV4U94H5rwaE=; b=Mw5UujJe/UDiR+VfDmKJp+MfGVyW3Dg7CvIoc6Gzj04/VmSln26FizITJQOwher2Cr 8z/2QHESAwbCInTK5lqEu3hjeMj7vooQ1xY4/euBfG15cmZorEOv9lQaAP72tDFgRS+9 MXrqZPK7Gjo9D3N4MnajSQsTD8Pn9Z6EJEx9qGo+fIel5baKlRfFanL44TOUDwECxsAY 046A9xvMxZIoOmaQ/bfHUGP5ZiaMdaIrl0NuxVoKE3BulqFNQ3XgKgzAzKmbpZ4XtJrn uvs7ZiGjJwn9ODxupy+qdRKwLrC9wPVpCVC1gV9y9oRTjWVscfaIM5wJSS1wbumtNyJ3 8DIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=noOiP1r+; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id y10-20020a655b0a000000b0039d6172e359si3811022pgq.414.2022.04.12.13.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 13:57:43 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=noOiP1r+; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 525309134B; Tue, 12 Apr 2022 13:21:04 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359621AbiDLHnZ (ORCPT + 99 others); Tue, 12 Apr 2022 03:43:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354060AbiDLHQ4 (ORCPT ); Tue, 12 Apr 2022 03:16:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C019348882; Mon, 11 Apr 2022 23:58:06 -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 0588B615A4; Tue, 12 Apr 2022 06:58:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A942C385A6; Tue, 12 Apr 2022 06:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746685; bh=b/+qkuaKqcpsC6aEEb3D76mekCKpkMRju0VRn4DhoMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=noOiP1r+jyXdrKoi9DWVBdssEHrq7rYCmfgsowbYZNY9h5wIGSEVkTRO5EJSUUqNv GNxkfyXNr4K+N0zRjf4GnOMr7rodHCK3gmlWWqTvH8wcIlcd40a7+BZQul2XU+tMQv du0kdHDFc+JUwGG21XJXkHSeu+IU70kxn7Uv+q4c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincent Mailhol , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 5.16 094/285] can: etas_es58x: es58x_fd_rx_event_msg(): initialize rx_event_msg before calling es58x_check_msg_len() Date: Tue, 12 Apr 2022 08:29:11 +0200 Message-Id: <20220412062946.376907108@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vincent Mailhol [ Upstream commit 7a8cd7c0ee823a1cc893ab3feaa23e4b602bfb9a ] Function es58x_fd_rx_event() invokes the es58x_check_msg_len() macro: | ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len); While doing so, it dereferences an uninitialized variable: *rx_event_msg. This is actually harmless because es58x_check_msg_len() only uses preprocessor macros (sizeof() and __stringify()) on *rx_event_msg. c.f. [1]. Nonetheless, this pattern is confusing so the lines are reordered to make sure that rx_event_msg is correctly initialized. This patch also fixes a false positive warning reported by cppcheck: | cppcheck possible warnings: (new ones prefixed by >>, may not be real problems) | | In file included from drivers/net/can/usb/etas_es58x/es58x_fd.c: | >> drivers/net/can/usb/etas_es58x/es58x_fd.c:174:8: warning: Uninitialized variable: rx_event_msg [uninitvar] | ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len); | ^ [1] https://elixir.bootlin.com/linux/v5.16/source/drivers/net/can/usb/etas_es58x/es58x_core.h#L467 Link: https://lore.kernel.org/all/20220306101302.708783-1-mailhol.vincent@wanadoo.fr Signed-off-by: Vincent Mailhol Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- drivers/net/can/usb/etas_es58x/es58x_fd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/can/usb/etas_es58x/es58x_fd.c b/drivers/net/can/usb/etas_es58x/es58x_fd.c index 4f0cae29f4d8..b71d1530638b 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_fd.c +++ b/drivers/net/can/usb/etas_es58x/es58x_fd.c @@ -171,12 +171,11 @@ static int es58x_fd_rx_event_msg(struct net_device *netdev, const struct es58x_fd_rx_event_msg *rx_event_msg; int ret; + rx_event_msg = &es58x_fd_urb_cmd->rx_event_msg; ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len); if (ret) return ret; - rx_event_msg = &es58x_fd_urb_cmd->rx_event_msg; - return es58x_rx_err_msg(netdev, rx_event_msg->error_code, rx_event_msg->event_code, get_unaligned_le64(&rx_event_msg->timestamp)); -- 2.35.1