Message ID | 20231122135242.2779058-1-Ilia.Gavrilov@infotecs.ru |
---|---|
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 io7csp1338092vqb; Wed, 22 Nov 2023 05:56:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFRWaBHVQkGGc/Jxp+rDgVJ6T2Dv4a2laFhvxvBonXxlJzjtDD+u6AFJeiH41Oj9WDHnXPD X-Received: by 2002:a17:902:d715:b0:1cc:68a5:f388 with SMTP id w21-20020a170902d71500b001cc68a5f388mr2010892ply.33.1700661373067; Wed, 22 Nov 2023 05:56:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700661373; cv=none; d=google.com; s=arc-20160816; b=pZ0KNrtH+pjf9phL7MjF9J63yIDgTWqrJto9BU3S74kpPC61D4Osgstnw9PBuUE9NW wRjddDHNNtu983gU6SRJq0LoZNE+LZdmg9Zy5k70LXHBL8DJ1VquhPs4MPG9dH7hic/B bhPdXZNEFEpmR3he8zHBrArfMaB3fWoQAcOLYpW0dyIXnETOEcTPseAhfa9s980wn/pg wulKwxuK6xaaw07VpQsQsX+VqCQiGWR4feFVhvVArIU+G0T980YYMKpuUoml1Jou/RP2 mj0G1E4K2ODdtkVmZHoTLCbVIKJQiKCyweQGdqwODirHhN6Tp7Ix81S2tMsjFeH4X0HZ DpXA== 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=WfKnDkL5/6UmicSAggQzojP2VBLZEawhK5wwMkpVq1E=; fh=NYzyJI8QcVghalubWg5fL0LnK0PafH7ptszXi1BE+Cw=; b=ypN4GQRMB9O0LEvEQCrhMHwf58poYwCPjn46dsTt3eid7ad6oRKpmbXguQhxWTTYc/ ALnE6fMirqpDlyHE+0c1+ANbMN7YFLQIqRRWOzKllYcmGaYibv+82VHGOroYnGJQtFf2 4kQICzddYtDEKdkSG8bSKrZqRBLXPx2zBg8YEjuSr+ZvGBo7OuLnB/uTyRk1euyjBdRW ieu+++lybh1zMEtODuzU2lC0HgHNB8CoKFwIcw30Qq8yOtau+kGYR1eFM4kXngGed67G 5ZPGq4FiQgA8BQK7th49hLXj4NZIs3y7RpvLxvKGXejb4JV/VaAmr+d/VkTv3aPlX2HS v6CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=OZ2rMpvd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id t3-20020a1709028c8300b001cc3527145bsi12072784plo.29.2023.11.22.05.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 05:56:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=OZ2rMpvd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 8809181067AF; Wed, 22 Nov 2023 05:55:37 -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 S1343970AbjKVNzg (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Wed, 22 Nov 2023 08:55:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343801AbjKVNzf (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 22 Nov 2023 08:55:35 -0500 Received: from mx0.infotecs.ru (mx0.infotecs.ru [91.244.183.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8279B101; Wed, 22 Nov 2023 05:55:29 -0800 (PST) Received: from mx0.infotecs-nt (localhost [127.0.0.1]) by mx0.infotecs.ru (Postfix) with ESMTP id A1721114CAA9; Wed, 22 Nov 2023 16:55:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx0.infotecs.ru A1721114CAA9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infotecs.ru; s=mx; t=1700661324; bh=WfKnDkL5/6UmicSAggQzojP2VBLZEawhK5wwMkpVq1E=; h=From:To:CC:Subject:Date:From; b=OZ2rMpvd/GJ73lWv/91VdsU2sZM9EbQqMl2PcXY1yYh7mpWJJ435lqjs2EumtYveD LOMIL4jCVIm39swBIRBi70L+FUbFbK9kS12PmU2HlwCfeW8Uz0mmlcp1lxxU5FHtqo iUULdiaJ0jWPW9vQbYt3HhoajFJ+0LGXPjDX+D+I= Received: from msk-exch-01.infotecs-nt (msk-exch-01.infotecs-nt [10.0.7.191]) by mx0.infotecs-nt (Postfix) with ESMTP id 9EC4031301CF; Wed, 22 Nov 2023 16:55:24 +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] calipso: Fix memory leak in netlbl_calipso_add_pass() Thread-Topic: [PATCH net] calipso: Fix memory leak in netlbl_calipso_add_pass() Thread-Index: AQHaHUuKnw2Bkvmb60ybqCKOZMz9OQ== Date: Wed, 22 Nov 2023 13:55:24 +0000 Message-ID: <20231122135242.2779058-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/22 12:40:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2023/11/22 10:55:00 #22501072 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 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]); Wed, 22 Nov 2023 05:55:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783272700306105708 X-GMAIL-MSGID: 1783272700306105708 |
Series |
[net] calipso: Fix memory leak in netlbl_calipso_add_pass()
|
|
Commit Message
Gavrilov Ilia
Nov. 22, 2023, 1:55 p.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>
---
net/netlabel/netlabel_calipso.c | 2 ++
1 file changed, 2 insertions(+)
Comments
On Wed, Nov 22, 2023 at 8:55 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(). It looks like a better option would be to return an error code in netlbl_calipso_add() so we never allocate the memory in the first place. Untested patch below, copy-n-paste'd so there is likely whitespace damage, but you get the idea. diff --git a/net/netlabel/netlabel_calipso.c b/net/netlabel/netlabel_calipso.c index f1d5b8465217..26a504dc6e57 100644 --- a/net/netlabel/netlabel_calipso.c +++ b/net/netlabel/netlabel_calipso.c @@ -54,8 +54,31 @@ 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 */ + /** * netlbl_calipso_add_pass - Adds a CALIPSO pass DOI definition * @info: the Generic NETLINK info block @@ -100,10 +123,13 @@ 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])) { @@ -363,28 +389,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
On 11/22/23 18:56, Paul Moore wrote: > On Wed, Nov 22, 2023 at 8:55 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(). > > It looks like a better option would be to return an error code in > netlbl_calipso_add() so we never allocate the memory in the first > place. > > Untested patch below, copy-n-paste'd so there is likely whitespace > damage, but you get the idea. > > diff --git a/net/netlabel/netlabel_calipso.c b/net/netlabel/netlabel_calipso.c > index f1d5b8465217..26a504dc6e57 100644 > --- a/net/netlabel/netlabel_calipso.c > +++ b/net/netlabel/netlabel_calipso.c > @@ -54,8 +54,31 @@ 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 > */ > + > /** > * netlbl_calipso_add_pass - Adds a CALIPSO pass DOI definition > * @info: the Generic NETLINK info block > @@ -100,10 +123,13 @@ 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])) { > @@ -363,28 +389,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 > Thank you for review. I'll test and send this idea in the next version.
diff --git a/net/netlabel/netlabel_calipso.c b/net/netlabel/netlabel_calipso.c index f1d5b8465217..76ae57c4df90 100644 --- a/net/netlabel/netlabel_calipso.c +++ b/net/netlabel/netlabel_calipso.c @@ -423,6 +423,8 @@ void calipso_doi_free(struct calipso_doi *doi_def) if (ops) ops->doi_free(doi_def); + else + kfree(doi_def); } /**