From patchwork Fri Oct 13 18:41:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 152697 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp2086227vqb; Fri, 13 Oct 2023 11:42:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3yACEyOPNwyrA1uGaGyFnTrwglDO3OcZO+QToWu1RLKHdHr0DpPXVi2SOj2TWwDlQotsE X-Received: by 2002:a17:902:dac8:b0:1bf:1a9e:85f7 with SMTP id q8-20020a170902dac800b001bf1a9e85f7mr31308474plx.1.1697222570217; Fri, 13 Oct 2023 11:42:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697222570; cv=none; d=google.com; s=arc-20160816; b=fynhH70ayeWrpOniZ6XYthdfcGPrnrynZ+klW5XasEcWRXPSNYITVONqOo7EvZe+vj 7F/S0KMUjvl7jhNw0AhnKLKbHggD7j7HXt+HGrFLcItlXVfsVQl5f+YR8JpcW7HT8glW Tl4e/ysdfQOecHqlaRDkLyomPWNyfFfopDQWTUsf3anImxMgT5ukgFCKvv6HGJAR+Iu/ LQSK0wi1BanCdSvjpxoT4B9BsxlIYSwd8H+0hggVpIJDxjPjG/iiA8imJ5OEXg79gUdl SmAAaFBy5X74oHcsQ5jgYWwjFUXYDkSM9oIIxW8ZgNp2QXgEjmaxazHmE4rnh/IaxDsm oBuQ== 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=BlcetPZENt/KWUqTdKuElmZntlZWvFUuRk0MWi//bA8=; fh=KQWP8YWWo7Ou0Co4J/9drgP7LsI7Ji8smUBWR1Hberk=; b=pNzUfXsCMp6j/A+u5bLj3rb60ddW3pxzl/x003sH15E2Ya+nC6cndUOM8/iLgGfucN l1AxjJ1VRVyVDYDvBT38YBTD8gNObvTaFNmdQH1uCUzOIO6g3Y2ILWIwxRQR3sSPx9PS 8kpX9kPvACBX4O26NVkjohGhnKwDBpbAQsFTOQzUR1zUY26ngtKz9cfNKseDWmFi/j3x Dx+gCGVXOU1Q5Y01MRuBCCbJea3jf/txU7rujNDDXHHTufb6AWecQiER1wRcYbvv9Kkn lu765voHWAcv4s438J/ydSaKtnQL4xya1oE4+Qu7gziWM/92gU5Za0XpMi9gp59g3qyh 0byg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z75SW8rJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id kg5-20020a170903060500b001c5bb1f0cccsi4653939plb.275.2023.10.13.11.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 11:42:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z75SW8rJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 60F8E8043EC1; Fri, 13 Oct 2023 11:42:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231468AbjJMSmJ (ORCPT + 19 others); Fri, 13 Oct 2023 14:42:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjJMSmH (ORCPT ); Fri, 13 Oct 2023 14:42:07 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B24595 for ; Fri, 13 Oct 2023 11:42:05 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-53db3811d8fso4903512a12.1 for ; Fri, 13 Oct 2023 11:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697222524; x=1697827324; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BlcetPZENt/KWUqTdKuElmZntlZWvFUuRk0MWi//bA8=; b=Z75SW8rJLM6vMUcAeZKpUczPTN/YEMJwR6PDl9Vd/m2Gnq/zhUFFKl5V6yoxPRYXWu c0Izk0LlqBNlz7n/SLietSdjUf9vWSTysf5bzKGhdbc67enRaeD+DHU8XzHDbBVod8gk p2Qp9JK0Q1bjcWRryaUTXeAvjyO6iip/lcUjv0XBsJMGiiaVPEcu1VxYfqQMR8unYKLX q7hHJnAVbYnqzu8SlAlqRnttKr/+msC+btuAcqKwV8VV4/Pu8qRL//UlmvGKPakIZFJj gRkJdgavPZJ0WqXcS8CGVe+02lAVjlWxfejwx7BdXB0X87HiLB71Xb4KDaHBwMv4HgB4 S4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697222524; x=1697827324; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BlcetPZENt/KWUqTdKuElmZntlZWvFUuRk0MWi//bA8=; b=hk5CplwXVnCtvkJXfMs+q7cwam+0iM66lyQyuo62eLDMZH7bYeXkzb0PhVE/xaxeFg eDfcG7Tis5iOGJ/9ztsrDaLhlyvTvndOES1Ko8gbi0rtXzJZ8bNOau69OD7nlikFl5i6 LvPjjjf2qguJnLYcAiNUg1KSNRbmiLpW080dwr14iY4x1GndAKuM5MhImAmlsNJeqtiE D45sB6M3JXPji08w9QekVbfYMx6MxLPQoNQDQtCd7g2B7XGES05ulWeaYYc1ABMjQ8Jg 9znSBEJtMsqJcjQuQ9I0zbT0fFyCpn+F6EdFr5RFKwCXCAgf/223xvkw4ShHq6u78AIo aq6w== X-Gm-Message-State: AOJu0YzbWdQqwFP4okzYQtda2CmOIaBydtZeqHKSdHo4OGxVTY1BRqNq mDvt9DMQaeH9ugvtxbS2ua8sng== X-Received: by 2002:a50:d658:0:b0:533:dcb1:5ab4 with SMTP id c24-20020a50d658000000b00533dcb15ab4mr821984edj.18.1697222523963; Fri, 13 Oct 2023 11:42:03 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.100]) by smtp.gmail.com with ESMTPSA id dm9-20020a05640222c900b0053db1ca293asm4173171edb.19.2023.10.13.11.42.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 11:42:03 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Samuel Ortiz , Frederic Danis , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?b?6buE5oCd6IGq?= , stable@vger.kernel.org Subject: [PATCH net-next] nfc: nci: fix possible NULL pointer dereference in send_acknowledge() Date: Fri, 13 Oct 2023 20:41:29 +0200 Message-Id: <20231013184129.18738-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 13 Oct 2023 11:42:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779666853557551668 X-GMAIL-MSGID: 1779666853557551668 Handle memory allocation failure from nci_skb_alloc() (calling alloc_skb()) to avoid possible NULL pointer dereference. Reported-by: 黄思聪 Fixes: 391d8a2da787 ("NFC: Add NCI over SPI receive") Cc: Signed-off-by: Krzysztof Kozlowski Reviewed-by: Simon Horman --- net/nfc/nci/spi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/nfc/nci/spi.c b/net/nfc/nci/spi.c index 0935527d1d12..b68150c971d0 100644 --- a/net/nfc/nci/spi.c +++ b/net/nfc/nci/spi.c @@ -151,6 +151,8 @@ static int send_acknowledge(struct nci_spi *nspi, u8 acknowledge) int ret; skb = nci_skb_alloc(nspi->ndev, 0, GFP_KERNEL); + if (!skb) + return -ENOMEM; /* add the NCI SPI header to the start of the buffer */ hdr = skb_push(skb, NCI_SPI_HDR_LEN);