Message ID | 20231121075357.344-1-phind.uet@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp461049vqb; Mon, 20 Nov 2023 23:54:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGdHtcbCJkqVjaX/RpPc/jJdUY+JpgkCgI6MrM2GwR2B/ziQ5xlfCq6Cw1c8kPa8W2NQXzj X-Received: by 2002:a05:6808:38c7:b0:3af:d9ea:74b6 with SMTP id el7-20020a05680838c700b003afd9ea74b6mr5833987oib.43.1700553267854; Mon, 20 Nov 2023 23:54:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700553267; cv=none; d=google.com; s=arc-20160816; b=seDWBC7OZoRD99XjE+Zt6GhYwOZpRJPAqYMh+TAr9241lmExLHXVvcj2lGFKzuNgER 0WmVlaVLZfiFVoJDvoY57jj14BKMyzIBpDUamY6Rnw6L+E08J9+eh7uT4FwRy40XFKzY +EnW71nzZKNjw2BCSgWBqeoFpPpjUiYerT6HzEHoyd85O+cqN7Yltz3O6XQ/82SSKvi1 vcbgRw6fgIF6zumtApubgHZ77XJB2Rwigyw130LmSbJqLEQWZQe9z8LdsyWHV9P12b3o GaJRlQRW9rB5VGR4x3mNEGxCM616/SXRyXbA2qnjpjWMjM0Tw3iD4HkVP4Y2Geh7BK0X /KXQ== 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=qjc16JuS7TAuQqo8p3/31+saz9w95ZEEb8nNI+ow3gQ=; fh=YZFum49QcIP/iVDCcsef3bdOPtru7mUfw8d2kLhtE/g=; b=BtzwoarX7qGh5SjOJYVH7UiNjTeJfUCVbT+2cNAtSJNaQ+ceJ2pUH+upjSSX/4VD7c 5gtYfPQCli5iBAOe/sDq1BZMjGE9qgn7JA3jnEnRKwpGheWyWmzWSWrKEH5/hwAp1EAa 4Sgro4BY9wZxJ9ispsP6O8lquYKduslzuUC9qsdiGdZb3AN2ARlklK8MughzlW0S2wuD XpybU2dUb48uq+lJxbjzxjbEZV43ZXXkKzLYt95RWwmN1H6NAo5QvtaqnOu5hLrXhspV aR+y+h76Aw95y1kTdK1Y8uZgzyTjesuuugWrU7QH5Rd1h+MNVFQT3pzvvU0Ae7CiOQTk o4HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=EkHDFR7x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id 30-20020a63145e000000b005b96cbfacdesi9672365pgu.196.2023.11.20.23.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 23:54:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=EkHDFR7x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 7BAFF80BB1FC; Mon, 20 Nov 2023 23:54:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229492AbjKUHyX (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Tue, 21 Nov 2023 02:54:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbjKUHyV (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 21 Nov 2023 02:54:21 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C484F5; Mon, 20 Nov 2023 23:54:17 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6c431b91b2aso4543164b3a.1; Mon, 20 Nov 2023 23:54:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700553257; x=1701158057; 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=qjc16JuS7TAuQqo8p3/31+saz9w95ZEEb8nNI+ow3gQ=; b=EkHDFR7xz9PNxxqqZRhW8kLmDKxtbU3Dh1Gf26FOwN9BHKb7JsvxLTSqEvBDG0IWu4 VUvoY4Woqob/NWvXsbOGe8wAlJnWlSPKViI1clF5arubP6Olt2/GObm/xk4coLDLw9SR x2TA9xYcpJsj8U3LFv+rnVwOfHqWoX8z83HbgwWTt9UBOadWw9Ad4c/mo2bUp6UYGY66 afteGZ9/6C0kMBzTwQGizIQ1K+ysHPgFtka48sN0mBW3NYQQwmpm/M7XAmVSpsYldxvf mzNIpCVaKZCi63gyILBxNXUG+AW22cRw+yvGq9dVQA+IIMwm/HfwKtLrcTm2OET2onDm Kppw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700553257; x=1701158057; 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=qjc16JuS7TAuQqo8p3/31+saz9w95ZEEb8nNI+ow3gQ=; b=n+T3xmJ3Q1zRcwJzhp64TnyQVHb829NjccV1ceDsljYV0VSGprxjaaUHocLayqjvR0 mcU6OLISsB8ifOIx2bGQgm//NgoMnDxQzDVF3GZmTHbCm2CN7uMgH8pYtRFkDIBSrEua LkMJDJLmABL/hkNms9k1jx1jPXy1q5i7OSbPYWd2+25m9VSSPWkpDJEMBHppg4gO7Wid jdeeT5gPp6NIBZnWN9i0qjeGXdANV+ReVmuluTeRk45z3Q5dIWMdeeDIJE9hPZwd2sTl w2WyLR9pZKVcrYbx/wAfg9WZ15AeCo2tCM4iFZ0xCX5BLyQTt8TIlMkSvUen/b1O642s 0MNw== X-Gm-Message-State: AOJu0YxwsTiktoug7Mt5aZFmzpNS3WY8KptrNmcS7gncw8TI4Xl8ZFB0 MydIL+H7o+g3BBcpoap4LQs= X-Received: by 2002:a05:6a21:6d88:b0:18a:b5c3:55c1 with SMTP id wl8-20020a056a216d8800b0018ab5c355c1mr3151932pzb.57.1700553256707; Mon, 20 Nov 2023 23:54:16 -0800 (PST) Received: from ubuntu-VirtualBox.. ([122.11.166.8]) by smtp.googlemail.com with ESMTPSA id z15-20020a170903018f00b001cf54e6b385sm5026931plg.203.2023.11.20.23.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 23:54:16 -0800 (PST) From: Nguyen Dinh Phi <phind.uet@gmail.com> To: Bongsu Jeon <bongsu.jeon@samsung.com>, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Cc: Nguyen Dinh Phi <phind.uet@gmail.com>, syzbot+6eb09d75211863f15e3e@syzkaller.appspotmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] nfc: virtual_ncidev: Add variable to check if ndev is running Date: Tue, 21 Nov 2023 15:53:57 +0800 Message-Id: <20231121075357.344-1-phind.uet@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 20 Nov 2023 23:54:23 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783159343421003865 X-GMAIL-MSGID: 1783159343421003865 |
Series |
[v2] nfc: virtual_ncidev: Add variable to check if ndev is running
|
|
Commit Message
Nguyen Dinh Phi
Nov. 21, 2023, 7:53 a.m. UTC
syzbot reported an memory leak that happens when an skb is add to
send_buff after virtual nci closed.
This patch adds a variable to track if the ndev is running before
handling new skb in send function.
Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com>
Reported-by: syzbot+6eb09d75211863f15e3e@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/lkml/00000000000075472b06007df4fb@google.com
---
V2:
- Remove unused macro.
- Re-adding a line that was removed wrongly.
drivers/nfc/virtual_ncidev.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Comments
On 21/11/2023 16:54, Nguyen Dinh Phi wrote: > syzbot reported an memory leak that happens when an skb is add to > send_buff after virtual nci closed. > This patch adds a variable to track if the ndev is running before > handling new skb in send function. > > Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com> > Reported-by: syzbot+6eb09d75211863f15e3e@syzkaller.appspotmail.com > Closes: https://lore.kernel.org/lkml/00000000000075472b06007df4fb@google.com > --- > V2: > - Remove unused macro. > - Re-adding a line that was removed wrongly. > drivers/nfc/virtual_ncidev.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/nfc/virtual_ncidev.c b/drivers/nfc/virtual_ncidev.c > index b027be0b0b6f..590b038e449e 100644 > --- a/drivers/nfc/virtual_ncidev.c > +++ b/drivers/nfc/virtual_ncidev.c > @@ -26,10 +26,14 @@ struct virtual_nci_dev { > struct mutex mtx; > struct sk_buff *send_buff; > struct wait_queue_head wq; > + bool running; > }; > > static int virtual_nci_open(struct nci_dev *ndev) > { > + struct virtual_nci_dev *vdev = nci_get_drvdata(ndev); > + > + vdev->running = true; > return 0; > } > > @@ -40,6 +44,7 @@ static int virtual_nci_close(struct nci_dev *ndev) > mutex_lock(&vdev->mtx); > kfree_skb(vdev->send_buff); > vdev->send_buff = NULL; > + vdev->running = false; > mutex_unlock(&vdev->mtx); > > return 0; > @@ -50,7 +55,7 @@ static int virtual_nci_send(struct nci_dev *ndev, struct sk_buff *skb) > struct virtual_nci_dev *vdev = nci_get_drvdata(ndev); > > mutex_lock(&vdev->mtx); > - if (vdev->send_buff) { > + if (vdev->send_buff || !vdev->running) { > mutex_unlock(&vdev->mtx); > kfree_skb(skb); > return -1; > -- > 2.39.2 Reviewed-by: Bongsu Jeon Best regards, Bongsu
On 21/11/2023 08:53, Nguyen Dinh Phi wrote: > syzbot reported an memory leak that happens when an skb is add to > send_buff after virtual nci closed. > This patch adds a variable to track if the ndev is running before > handling new skb in send function. > > Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com> > Reported-by: syzbot+6eb09d75211863f15e3e@syzkaller.appspotmail.com > Closes: https://lore.kernel.org/lkml/00000000000075472b06007df4fb@google.com > --- > V2: > - Remove unused macro. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Tue, 21 Nov 2023 15:53:57 +0800 you wrote: > syzbot reported an memory leak that happens when an skb is add to > send_buff after virtual nci closed. > This patch adds a variable to track if the ndev is running before > handling new skb in send function. > > Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com> > Reported-by: syzbot+6eb09d75211863f15e3e@syzkaller.appspotmail.com > Closes: https://lore.kernel.org/lkml/00000000000075472b06007df4fb@google.com > > [...] Here is the summary with links: - [v2] nfc: virtual_ncidev: Add variable to check if ndev is running https://git.kernel.org/netdev/net/c/84d2db91f14a You are awesome, thank you!
diff --git a/drivers/nfc/virtual_ncidev.c b/drivers/nfc/virtual_ncidev.c index b027be0b0b6f..590b038e449e 100644 --- a/drivers/nfc/virtual_ncidev.c +++ b/drivers/nfc/virtual_ncidev.c @@ -26,10 +26,14 @@ struct virtual_nci_dev { struct mutex mtx; struct sk_buff *send_buff; struct wait_queue_head wq; + bool running; }; static int virtual_nci_open(struct nci_dev *ndev) { + struct virtual_nci_dev *vdev = nci_get_drvdata(ndev); + + vdev->running = true; return 0; } @@ -40,6 +44,7 @@ static int virtual_nci_close(struct nci_dev *ndev) mutex_lock(&vdev->mtx); kfree_skb(vdev->send_buff); vdev->send_buff = NULL; + vdev->running = false; mutex_unlock(&vdev->mtx); return 0; @@ -50,7 +55,7 @@ static int virtual_nci_send(struct nci_dev *ndev, struct sk_buff *skb) struct virtual_nci_dev *vdev = nci_get_drvdata(ndev); mutex_lock(&vdev->mtx); - if (vdev->send_buff) { + if (vdev->send_buff || !vdev->running) { mutex_unlock(&vdev->mtx); kfree_skb(skb); return -1;