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 <[email protected]>
---
v2:
- return the error code in netlbl_calipso_add() if the variable calipso_hops is NULL
v1: https://lore.kernel.org/all/[email protected]/
net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++----------------
1 file changed, 26 insertions(+), 23 deletions(-)
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
--
2.39.2
On Thu, Nov 23, 2023 at 4:25 AM Gavrilov Ilia <[email protected]> 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 <[email protected]>
> ---
> v2:
> - return the error code in netlbl_calipso_add() if the variable calipso_hops is NULL
> v1: https://lore.kernel.org/all/[email protected]/
>
> net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++----------------
> 1 file changed, 26 insertions(+), 23 deletions(-)
This looks good to me, thanks!
Acked-by: Paul Moore <[email protected]>
--
paul-moore.com
On Sat, Nov 25, 2023 at 9:47 AM Paul Moore <[email protected]> wrote:
>
> On Thu, Nov 23, 2023 at 4:25 AM Gavrilov Ilia <[email protected]> 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 <[email protected]>
> > ---
> > v2:
> > - return the error code in netlbl_calipso_add() if the variable calipso_hops is NULL
> > v1: https://lore.kernel.org/all/[email protected]/
> >
> > net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++----------------
> > 1 file changed, 26 insertions(+), 23 deletions(-)
>
> This looks good to me, thanks!
>
> Acked-by: Paul Moore <[email protected]>
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?
--
paul-moore.com
On 12/6/23 00:31, Paul Moore wrote:
> On Sat, Nov 25, 2023 at 9:47 AM Paul Moore <[email protected]> wrote:
>>
>> On Thu, Nov 23, 2023 at 4:25 AM Gavrilov Ilia <[email protected]> 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 <[email protected]>
>>> ---
>>> v2:
>>> - return the error code in netlbl_calipso_add() if the variable calipso_hops is NULL
>>> v1: https://lore.kernel.org/all/[email protected]/
>>>
>>> net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++----------------
>>> 1 file changed, 26 insertions(+), 23 deletions(-)
>>
>> This looks good to me, thanks!
>>
>> Acked-by: Paul Moore <[email protected]>
>
> 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 <[email protected]> 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.
--
paul-moore.com