Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2514631pxb; Mon, 18 Jan 2021 21:51:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/Zx6nrpn40k8oDgj9JlM2CkaAPtGPD9UwqHYUXtsAQ9iyzWh0M/dz9VX1oQP3RsXum6aI X-Received: by 2002:a50:8b66:: with SMTP id l93mr2011693edl.384.1611035480339; Mon, 18 Jan 2021 21:51:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611035480; cv=none; d=google.com; s=arc-20160816; b=q3eI/1Iapd2GLO8/LOVbvaACylmf27Ha/kO6MeVBhjCXxjS4We77k317WnWGEPYYP2 SnwmOJgaPu5le/u25GyBtoo3Uhn/9qg3Pxg0RA0vOWmprd+zxhyaqnpmSPdF5kU14XQE XVv/UJetfePX5j4PZUTivzySwvZRh4bMd1D0AWBeZtYyM1J4iSqh5eOjcHQOeTExmXJP VihbH+smSVO4GuxWHICmgVyOZNrR5TPD6HAmaTA/gh5udj2Ey0xqRYlAY5Q2YUAby8Ty raUuUgk1svb6idsZaUM3sy+TbYeRl2UnsTsuIYN1Ya4ytklQudIyMiT6jWTW5K3msd79 esFw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=vHix2+n2QGovG//SAmKczG/2f6L1TM+9VB0Ed1N3GGs=; b=J1P6sTJDK7oOf49Oy/pBHVf5Di40QEWB5neCThs8XfLiVtms3A1rQlK6rV/a6ZyG82 X5XHyuXYdAYzAabZugPRln08gNcaDYezD/drQHp+IluI/3rx7OZDSuycdI3txGFcTEJH q3SRwcMeFXD75YQT9rVWSgFXkFY7lWvXbq1bJGhO14g/4O5ShVjuoPEYeml+R2ownOaX 3EMsVb8xf4PfIgaGKlUEC76DGUlZMmPSssXbN5j2xXst1MTXoVyw6I7hsqxqfwPdTDmf FblvDN3j1g39FQQ2xHzOJPdFJFCLOd6QVzq3BGCdh3pS482aGlMbuLaju0CHcRgmI3gl TNsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=QNSjB7oG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c24si4391552edy.179.2021.01.18.21.50.56; Mon, 18 Jan 2021 21:51:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=@163.com header.s=s110527 header.b=QNSjB7oG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393535AbhASCHP (ORCPT + 99 others); Mon, 18 Jan 2021 21:07:15 -0500 Received: from m12-18.163.com ([220.181.12.18]:60624 "EHLO m12-18.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387895AbhASCHO (ORCPT ); Mon, 18 Jan 2021 21:07:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=vHix2 +n2QGovG//SAmKczG/2f6L1TM+9VB0Ed1N3GGs=; b=QNSjB7oGulC5j4n2SKI2T dg6MelHn97ZuEtGJrWCoWrslsgYH8IVuAzIU6xkPtiMDrLBGgxmW1Yo3Lb86wp26 ymO9wOsX7ivSkd/7Z7H6B3+am/f5Cpc5a3MfsmYMjB66AuY7N8GX2EkSEyizAMro xCg5FL2LbX5knJk5kt5Qrk= Received: from yangjunlin.ccdomain.com (unknown [119.137.52.160]) by smtp14 (Coremail) with SMTP id EsCowAAn7tYzPgZg4b59Pw--.4219S2; Tue, 19 Jan 2021 10:04:37 +0800 (CST) From: angkery To: mkl@pengutronix.de, manivannan.sadhasivam@linaro.org, thomas.kopp@microchip.com, wg@grandegger.com, davem@davemloft.net, kuba@kernel.org Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Junlin Yang Subject: [PATCH] can: mcp251xfd: mcp251xfd_handle_ivmif(): fix wrong NULL pointer check Date: Tue, 19 Jan 2021 10:02:21 +0800 Message-Id: <20210119020221.3713-1-angkery@163.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: EsCowAAn7tYzPgZg4b59Pw--.4219S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrZF1ktr4rtr4DuFWxKFy3urg_yoW3Krb_Cw nxAw17Wr18Aw1vk34IkF1avryYv3ZrXFs5ur9Fvry3JFWayr17GFZavry3G34UWry8ZF9x Xay7Jwn2q34FqjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUeEPfDUUUUU== X-Originating-IP: [119.137.52.160] X-CM-SenderInfo: 5dqjyvlu16il2tof0z/xtbCBg0fI13I0cYuQwAAsY Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Junlin Yang if alloc_can_err_skb() returns NULL, we should check skb instead of cf. Signed-off-by: Junlin Yang --- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c index f07e8b7..0af131c 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -1755,7 +1755,7 @@ static int mcp251xfd_handle_ivmif(struct mcp251xfd_priv *priv) cf->data[2] |= CAN_ERR_PROT_TX | CAN_ERR_PROT_BIT0; } - if (!cf) + if (!skb) return 0; err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp); -- 1.9.1