Message ID | 20231123092314.91299-1-Ilia.Gavrilov@infotecs.ru |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp320918vqx; Thu, 23 Nov 2023 01:26:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHZTZFeQ55LQfa2Y8L2ehU+STuxEN6Pm3pAP9gWcEbeL7x6TPpLHIJCGv2f6aEJQY/kzEko X-Received: by 2002:a17:903:32cb:b0:1c9:d0a0:ee88 with SMTP id i11-20020a17090332cb00b001c9d0a0ee88mr5126240plr.62.1700731571828; Thu, 23 Nov 2023 01:26:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700731571; cv=none; d=google.com; s=arc-20160816; b=rOPAEtQwNYB2ZJmY/WfXIhmLDWqrNVHXO9kNgFmxXTP4XJLPCSG6ADvmmEcf181Jf7 3gmLvAJh5hkEWvh5Has+63HMseXqB/Db3hcIa8g7PHv3Xp826UXNdIH9Me0bFMVc42k4 NFBRzLh9DEUT2dVhGHZfLV3r/jJWbuWJOKIN0b4GHUb0bC7E5mVlIyZjBUqanXl5ngfB XCdGnhj5wNEOE+NsMl7sFKpjcYu+fT3aJrST1RFufXixSx7RT3NoVeXXZSGEZesFc53x sq49tv1A9f0+PIRupmNDwSptFbR/EGLHcQJXBR/zixWzjWdXu30KTUsiiQZ12QD4Aops DbiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature:dkim-filter; bh=lA6R2xYOxsaucfW0fbUZrtsLYzmnyeXkqpK0MlytNN0=; fh=NYzyJI8QcVghalubWg5fL0LnK0PafH7ptszXi1BE+Cw=; b=CH89sNDqTN4vNZ8p6euFRD2G4YJ9+7HnESAMxMhEVHbjqntb36W4dCjE5zLftTF1iS 2DDLJqaSph0kFRmiB3chBKVTFtDXkx/UaNeZhFuNU79tyd/r6H387EGOWmKezBUp2tua Jnf4mV4iiU29a+kyzM7On76d1sth6g2P+2AUD8HFXIIzgekpluqGGjfGU4TLN7EWB8WW Io/VkYhu36duDUn6MR4lyyMj3WjX5nJDZM90yqXHyyXc8ltcqMUZEY4kZx3VtHv8RfEI El8YGNctkoQ4qGOuWg6MD7CcbqNIYbXs9cujFfKZoL/JRl+k5qtAzjz/OkdMCb6QEh4G ZQug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=IPQY3vK8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=infotecs.ru Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id jj14-20020a170903048e00b001cf6aac6b5fsi753293plb.559.2023.11.23.01.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 01:26:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=IPQY3vK8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=infotecs.ru Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id A434280765D0; Thu, 23 Nov 2023 01:26:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231590AbjKWJZy (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Thu, 23 Nov 2023 04:25:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229464AbjKWJZx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 23 Nov 2023 04:25:53 -0500 Received: from mx0.infotecs.ru (mx0.infotecs.ru [91.244.183.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4347DDD; Thu, 23 Nov 2023 01:25:58 -0800 (PST) Received: from mx0.infotecs-nt (localhost [127.0.0.1]) by mx0.infotecs.ru (Postfix) with ESMTP id 528061186113; Thu, 23 Nov 2023 12:25:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx0.infotecs.ru 528061186113 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infotecs.ru; s=mx; t=1700731556; bh=lA6R2xYOxsaucfW0fbUZrtsLYzmnyeXkqpK0MlytNN0=; h=From:To:CC:Subject:Date:From; b=IPQY3vK8Xk6pKBcUeVa4PEQ45sGWgcixKAqzzCXFHr9EoPIuFjGtZ4N1lAlQegP6u lmL5QlhboKHYEC5+4KBuvsHATBL4awEQSHXCFjtUeyuAkYrHDLNT49f6Nl78UN1dpY wn/eCi0ttJS/lEv/duHH+fkaA70iYADFsGr+u2MI= Received: from msk-exch-02.infotecs-nt (msk-exch-02.infotecs-nt [10.0.7.192]) by mx0.infotecs-nt (Postfix) with ESMTP id 4F455312FFE4; Thu, 23 Nov 2023 12:25:55 +0300 (MSK) From: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> To: Paul Moore <paul@paul-moore.com> CC: "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Huw Davies <huw@codeweavers.com>, "netdev@vger.kernel.org" <netdev@vger.kernel.org>, "linux-security-module@vger.kernel.org" <linux-security-module@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "lvc-project@linuxtesting.org" <lvc-project@linuxtesting.org> Subject: [PATCH net v2] calipso: Fix memory leak in netlbl_calipso_add_pass() Thread-Topic: [PATCH net v2] calipso: Fix memory leak in netlbl_calipso_add_pass() Thread-Index: AQHaHe8PzUY9PMUIEUGPey0eifO26Q== Date: Thu, 23 Nov 2023 09:25:54 +0000 Message-ID: <20231123092314.91299-1-Ilia.Gavrilov@infotecs.ru> Accept-Language: ru-RU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.17.0.10] x-exclaimer-md-config: 208ac3cd-1ed4-4982-a353-bdefac89ac0a Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-KLMS-Rule-ID: 5 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Status: not scanned, disabled by settings X-KLMS-AntiSpam-Interceptor-Info: not scanned X-KLMS-AntiPhishing: Clean, bases: 2023/11/23 07:58:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2023/11/23 06:11:00 #22507418 X-KLMS-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 pete.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 (pete.vger.email [0.0.0.0]); Thu, 23 Nov 2023 01:26:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783346309003607706 X-GMAIL-MSGID: 1783346309003607706 |
Series |
[net,v2] calipso: Fix memory leak in netlbl_calipso_add_pass()
|
|
Commit Message
Gavrilov Ilia
Nov. 23, 2023, 9:25 a.m. UTC
If IPv6 support is disabled at boot (ipv6.disable=1),
the calipso_init() -> netlbl_calipso_ops_register() function isn't called,
and the netlbl_calipso_ops_get() function always returns NULL.
In this case, the netlbl_calipso_add_pass() function allocates memory
for the doi_def variable but doesn't free it with the calipso_doi_free().
BUG: memory leak
unreferenced object 0xffff888011d68180 (size 64):
comm "syz-executor.1", pid 10746, jiffies 4295410986 (age 17.928s)
hex dump (first 32 bytes):
00 00 00 00 02 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000730d8770>] kmalloc include/linux/slab.h:552 [inline]
[<00000000730d8770>] netlbl_calipso_add_pass net/netlabel/netlabel_calipso.c:76 [inline]
[<00000000730d8770>] netlbl_calipso_add+0x22e/0x4f0 net/netlabel/netlabel_calipso.c:111
[<0000000002e662c0>] genl_family_rcv_msg_doit+0x22f/0x330 net/netlink/genetlink.c:739
[<00000000a08d6d74>] genl_family_rcv_msg net/netlink/genetlink.c:783 [inline]
[<00000000a08d6d74>] genl_rcv_msg+0x341/0x5a0 net/netlink/genetlink.c:800
[<0000000098399a97>] netlink_rcv_skb+0x14d/0x440 net/netlink/af_netlink.c:2515
[<00000000ff7db83b>] genl_rcv+0x29/0x40 net/netlink/genetlink.c:811
[<000000000cf53b8c>] netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline]
[<000000000cf53b8c>] netlink_unicast+0x54b/0x800 net/netlink/af_netlink.c:1339
[<00000000d78cd38b>] netlink_sendmsg+0x90a/0xdf0 net/netlink/af_netlink.c:1934
[<000000008328a57f>] sock_sendmsg_nosec net/socket.c:651 [inline]
[<000000008328a57f>] sock_sendmsg+0x157/0x190 net/socket.c:671
[<000000007b65a1b5>] ____sys_sendmsg+0x712/0x870 net/socket.c:2342
[<0000000083da800e>] ___sys_sendmsg+0xf8/0x170 net/socket.c:2396
[<000000004a9b827f>] __sys_sendmsg+0xea/0x1b0 net/socket.c:2429
[<0000000061b64d3a>] do_syscall_64+0x30/0x40 arch/x86/entry/common.c:46
[<00000000a1265347>] entry_SYSCALL_64_after_hwframe+0x61/0xc6
Found by InfoTeCS on behalf of Linux Verification Center
(linuxtesting.org) with Syzkaller
Fixes: cb72d38211ea ("netlabel: Initial support for the CALIPSO netlink protocol.")
Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
---
v2:
- return the error code in netlbl_calipso_add() if the variable calipso_hops is NULL
v1: https://lore.kernel.org/all/20231122135242.2779058-1-Ilia.Gavrilov@infotecs.ru/
net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++----------------
1 file changed, 26 insertions(+), 23 deletions(-)
Comments
On Thu, Nov 23, 2023 at 4:25 AM Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> wrote: > > If IPv6 support is disabled at boot (ipv6.disable=1), > the calipso_init() -> netlbl_calipso_ops_register() function isn't called, > and the netlbl_calipso_ops_get() function always returns NULL. > In this case, the netlbl_calipso_add_pass() function allocates memory > for the doi_def variable but doesn't free it with the calipso_doi_free(). > > BUG: memory leak > unreferenced object 0xffff888011d68180 (size 64): > comm "syz-executor.1", pid 10746, jiffies 4295410986 (age 17.928s) > hex dump (first 32 bytes): > 00 00 00 00 02 00 00 00 00 00 00 00 00 00 00 00 ................ > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > backtrace: > [<00000000730d8770>] kmalloc include/linux/slab.h:552 [inline] > [<00000000730d8770>] netlbl_calipso_add_pass net/netlabel/netlabel_calipso.c:76 [inline] > [<00000000730d8770>] netlbl_calipso_add+0x22e/0x4f0 net/netlabel/netlabel_calipso.c:111 > [<0000000002e662c0>] genl_family_rcv_msg_doit+0x22f/0x330 net/netlink/genetlink.c:739 > [<00000000a08d6d74>] genl_family_rcv_msg net/netlink/genetlink.c:783 [inline] > [<00000000a08d6d74>] genl_rcv_msg+0x341/0x5a0 net/netlink/genetlink.c:800 > [<0000000098399a97>] netlink_rcv_skb+0x14d/0x440 net/netlink/af_netlink.c:2515 > [<00000000ff7db83b>] genl_rcv+0x29/0x40 net/netlink/genetlink.c:811 > [<000000000cf53b8c>] netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline] > [<000000000cf53b8c>] netlink_unicast+0x54b/0x800 net/netlink/af_netlink.c:1339 > [<00000000d78cd38b>] netlink_sendmsg+0x90a/0xdf0 net/netlink/af_netlink.c:1934 > [<000000008328a57f>] sock_sendmsg_nosec net/socket.c:651 [inline] > [<000000008328a57f>] sock_sendmsg+0x157/0x190 net/socket.c:671 > [<000000007b65a1b5>] ____sys_sendmsg+0x712/0x870 net/socket.c:2342 > [<0000000083da800e>] ___sys_sendmsg+0xf8/0x170 net/socket.c:2396 > [<000000004a9b827f>] __sys_sendmsg+0xea/0x1b0 net/socket.c:2429 > [<0000000061b64d3a>] do_syscall_64+0x30/0x40 arch/x86/entry/common.c:46 > [<00000000a1265347>] entry_SYSCALL_64_after_hwframe+0x61/0xc6 > > Found by InfoTeCS on behalf of Linux Verification Center > (linuxtesting.org) with Syzkaller > > Fixes: cb72d38211ea ("netlabel: Initial support for the CALIPSO netlink protocol.") > Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> > --- > v2: > - return the error code in netlbl_calipso_add() if the variable calipso_hops is NULL > v1: https://lore.kernel.org/all/20231122135242.2779058-1-Ilia.Gavrilov@infotecs.ru/ > > net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++---------------- > 1 file changed, 26 insertions(+), 23 deletions(-) This looks good to me, thanks! Acked-by: Paul Moore <paul@paul-moore.com>
On Sat, Nov 25, 2023 at 9:47 AM Paul Moore <paul@paul-moore.com> wrote: > > On Thu, Nov 23, 2023 at 4:25 AM Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> wrote: > > > > If IPv6 support is disabled at boot (ipv6.disable=1), > > the calipso_init() -> netlbl_calipso_ops_register() function isn't called, > > and the netlbl_calipso_ops_get() function always returns NULL. > > In this case, the netlbl_calipso_add_pass() function allocates memory > > for the doi_def variable but doesn't free it with the calipso_doi_free(). > > > > BUG: memory leak > > unreferenced object 0xffff888011d68180 (size 64): > > comm "syz-executor.1", pid 10746, jiffies 4295410986 (age 17.928s) > > hex dump (first 32 bytes): > > 00 00 00 00 02 00 00 00 00 00 00 00 00 00 00 00 ................ > > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > > backtrace: > > [<00000000730d8770>] kmalloc include/linux/slab.h:552 [inline] > > [<00000000730d8770>] netlbl_calipso_add_pass net/netlabel/netlabel_calipso.c:76 [inline] > > [<00000000730d8770>] netlbl_calipso_add+0x22e/0x4f0 net/netlabel/netlabel_calipso.c:111 > > [<0000000002e662c0>] genl_family_rcv_msg_doit+0x22f/0x330 net/netlink/genetlink.c:739 > > [<00000000a08d6d74>] genl_family_rcv_msg net/netlink/genetlink.c:783 [inline] > > [<00000000a08d6d74>] genl_rcv_msg+0x341/0x5a0 net/netlink/genetlink.c:800 > > [<0000000098399a97>] netlink_rcv_skb+0x14d/0x440 net/netlink/af_netlink.c:2515 > > [<00000000ff7db83b>] genl_rcv+0x29/0x40 net/netlink/genetlink.c:811 > > [<000000000cf53b8c>] netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline] > > [<000000000cf53b8c>] netlink_unicast+0x54b/0x800 net/netlink/af_netlink.c:1339 > > [<00000000d78cd38b>] netlink_sendmsg+0x90a/0xdf0 net/netlink/af_netlink.c:1934 > > [<000000008328a57f>] sock_sendmsg_nosec net/socket.c:651 [inline] > > [<000000008328a57f>] sock_sendmsg+0x157/0x190 net/socket.c:671 > > [<000000007b65a1b5>] ____sys_sendmsg+0x712/0x870 net/socket.c:2342 > > [<0000000083da800e>] ___sys_sendmsg+0xf8/0x170 net/socket.c:2396 > > [<000000004a9b827f>] __sys_sendmsg+0xea/0x1b0 net/socket.c:2429 > > [<0000000061b64d3a>] do_syscall_64+0x30/0x40 arch/x86/entry/common.c:46 > > [<00000000a1265347>] entry_SYSCALL_64_after_hwframe+0x61/0xc6 > > > > Found by InfoTeCS on behalf of Linux Verification Center > > (linuxtesting.org) with Syzkaller > > > > Fixes: cb72d38211ea ("netlabel: Initial support for the CALIPSO netlink protocol.") > > Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> > > --- > > v2: > > - return the error code in netlbl_calipso_add() if the variable calipso_hops is NULL > > v1: https://lore.kernel.org/all/20231122135242.2779058-1-Ilia.Gavrilov@infotecs.ru/ > > > > net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++---------------- > > 1 file changed, 26 insertions(+), 23 deletions(-) > > This looks good to me, thanks! > > Acked-by: Paul Moore <paul@paul-moore.com> A quick follow-up to see if this patch was picked up by the networking folks? I didn't get a patchwork notification, and I don't see it in Linus' tree, but perhaps I missed something?
On 12/6/23 00:31, Paul Moore wrote: > On Sat, Nov 25, 2023 at 9:47 AM Paul Moore <paul@paul-moore.com> wrote: >> >> On Thu, Nov 23, 2023 at 4:25 AM Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> wrote: >>> >>> If IPv6 support is disabled at boot (ipv6.disable=1), >>> the calipso_init() -> netlbl_calipso_ops_register() function isn't called, >>> and the netlbl_calipso_ops_get() function always returns NULL. >>> In this case, the netlbl_calipso_add_pass() function allocates memory >>> for the doi_def variable but doesn't free it with the calipso_doi_free(). >>> >>> BUG: memory leak >>> unreferenced object 0xffff888011d68180 (size 64): >>> comm "syz-executor.1", pid 10746, jiffies 4295410986 (age 17.928s) >>> hex dump (first 32 bytes): >>> 00 00 00 00 02 00 00 00 00 00 00 00 00 00 00 00 ................ >>> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ >>> backtrace: >>> [<00000000730d8770>] kmalloc include/linux/slab.h:552 [inline] >>> [<00000000730d8770>] netlbl_calipso_add_pass net/netlabel/netlabel_calipso.c:76 [inline] >>> [<00000000730d8770>] netlbl_calipso_add+0x22e/0x4f0 net/netlabel/netlabel_calipso.c:111 >>> [<0000000002e662c0>] genl_family_rcv_msg_doit+0x22f/0x330 net/netlink/genetlink.c:739 >>> [<00000000a08d6d74>] genl_family_rcv_msg net/netlink/genetlink.c:783 [inline] >>> [<00000000a08d6d74>] genl_rcv_msg+0x341/0x5a0 net/netlink/genetlink.c:800 >>> [<0000000098399a97>] netlink_rcv_skb+0x14d/0x440 net/netlink/af_netlink.c:2515 >>> [<00000000ff7db83b>] genl_rcv+0x29/0x40 net/netlink/genetlink.c:811 >>> [<000000000cf53b8c>] netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline] >>> [<000000000cf53b8c>] netlink_unicast+0x54b/0x800 net/netlink/af_netlink.c:1339 >>> [<00000000d78cd38b>] netlink_sendmsg+0x90a/0xdf0 net/netlink/af_netlink.c:1934 >>> [<000000008328a57f>] sock_sendmsg_nosec net/socket.c:651 [inline] >>> [<000000008328a57f>] sock_sendmsg+0x157/0x190 net/socket.c:671 >>> [<000000007b65a1b5>] ____sys_sendmsg+0x712/0x870 net/socket.c:2342 >>> [<0000000083da800e>] ___sys_sendmsg+0xf8/0x170 net/socket.c:2396 >>> [<000000004a9b827f>] __sys_sendmsg+0xea/0x1b0 net/socket.c:2429 >>> [<0000000061b64d3a>] do_syscall_64+0x30/0x40 arch/x86/entry/common.c:46 >>> [<00000000a1265347>] entry_SYSCALL_64_after_hwframe+0x61/0xc6 >>> >>> Found by InfoTeCS on behalf of Linux Verification Center >>> (linuxtesting.org) with Syzkaller >>> >>> Fixes: cb72d38211ea ("netlabel: Initial support for the CALIPSO netlink protocol.") >>> Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> >>> --- >>> v2: >>> - return the error code in netlbl_calipso_add() if the variable calipso_hops is NULL >>> v1: https://lore.kernel.org/all/20231122135242.2779058-1-Ilia.Gavrilov@infotecs.ru/ >>> >>> net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++---------------- >>> 1 file changed, 26 insertions(+), 23 deletions(-) >> >> This looks good to me, thanks! >> >> Acked-by: Paul Moore <paul@paul-moore.com> > > A quick follow-up to see if this patch was picked up by the networking > folks? I didn't get a patchwork notification, and I don't see it in > Linus' tree, but perhaps I missed something? > I only see than the patch is in the "Not Applicable" state in patchwork.
On Tue, 5 Dec 2023 16:31:20 -0500 Paul Moore wrote: > A quick follow-up to see if this patch was picked up by the networking > folks? I didn't get a patchwork notification, and I don't see it in > Linus' tree, but perhaps I missed something? Oops. Feel free to take it via your tree.
On Wed, Dec 6, 2023 at 10:55 AM Jakub Kicinski <kuba@kernel.org> wrote: > > On Tue, 5 Dec 2023 16:31:20 -0500 Paul Moore wrote: > > A quick follow-up to see if this patch was picked up by the networking > > folks? I didn't get a patchwork notification, and I don't see it in > > Linus' tree, but perhaps I missed something? > > Oops. Feel free to take it via your tree. Okay, will do. I don't believe this is a stable candidate so I'm going to merge this into the lsm/dev branch, it should be there shortly.
diff --git a/net/netlabel/netlabel_calipso.c b/net/netlabel/netlabel_calipso.c index f1d5b8465217..a07c2216d28b 100644 --- a/net/netlabel/netlabel_calipso.c +++ b/net/netlabel/netlabel_calipso.c @@ -54,6 +54,28 @@ static const struct nla_policy calipso_genl_policy[NLBL_CALIPSO_A_MAX + 1] = { [NLBL_CALIPSO_A_MTYPE] = { .type = NLA_U32 }, }; +static const struct netlbl_calipso_ops *calipso_ops; + +/** + * netlbl_calipso_ops_register - Register the CALIPSO operations + * @ops: ops to register + * + * Description: + * Register the CALIPSO packet engine operations. + * + */ +const struct netlbl_calipso_ops * +netlbl_calipso_ops_register(const struct netlbl_calipso_ops *ops) +{ + return xchg(&calipso_ops, ops); +} +EXPORT_SYMBOL(netlbl_calipso_ops_register); + +static const struct netlbl_calipso_ops *netlbl_calipso_ops_get(void) +{ + return READ_ONCE(calipso_ops); +} + /* NetLabel Command Handlers */ /** @@ -96,15 +118,18 @@ static int netlbl_calipso_add_pass(struct genl_info *info, * */ static int netlbl_calipso_add(struct sk_buff *skb, struct genl_info *info) - { int ret_val = -EINVAL; struct netlbl_audit audit_info; + const struct netlbl_calipso_ops *ops = netlbl_calipso_ops_get(); if (!info->attrs[NLBL_CALIPSO_A_DOI] || !info->attrs[NLBL_CALIPSO_A_MTYPE]) return -EINVAL; + if (!ops) + return -EOPNOTSUPP; + netlbl_netlink_auditinfo(&audit_info); switch (nla_get_u32(info->attrs[NLBL_CALIPSO_A_MTYPE])) { case CALIPSO_MAP_PASS: @@ -363,28 +388,6 @@ int __init netlbl_calipso_genl_init(void) return genl_register_family(&netlbl_calipso_gnl_family); } -static const struct netlbl_calipso_ops *calipso_ops; - -/** - * netlbl_calipso_ops_register - Register the CALIPSO operations - * @ops: ops to register - * - * Description: - * Register the CALIPSO packet engine operations. - * - */ -const struct netlbl_calipso_ops * -netlbl_calipso_ops_register(const struct netlbl_calipso_ops *ops) -{ - return xchg(&calipso_ops, ops); -} -EXPORT_SYMBOL(netlbl_calipso_ops_register); - -static const struct netlbl_calipso_ops *netlbl_calipso_ops_get(void) -{ - return READ_ONCE(calipso_ops); -} - /** * calipso_doi_add - Add a new DOI to the CALIPSO protocol engine * @doi_def: the DOI structure