From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 819EDC48BE6 for ; Thu, 10 Jun 2021 23:40:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BF8661359 for ; Thu, 10 Jun 2021 23:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230451AbhFJXmV (ORCPT ); Thu, 10 Jun 2021 19:42:21 -0400 Received: from mail-ej1-f44.google.com ([209.85.218.44]:39633 "EHLO mail-ej1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230212AbhFJXmR (ORCPT ); Thu, 10 Jun 2021 19:42:17 -0400 Received: by mail-ej1-f44.google.com with SMTP id l1so1684321ejb.6 for ; Thu, 10 Jun 2021 16:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=PbPy0sLFc6s1iVCDr+0Neuhg5szqPhBqV3IvM8xe9Rc=; b=MdASbkKBw1qZi8qXv8QILiOVDXfXorlejkwLkYa9mTv0mfWe3/65hu6qCgVdU+GaQG 08XIP2PKL6Vbau47nQbrwBYpvOZu09GKmjDFd5ci9XLj+MleAhQ2g/WThXeEqQYaCUPY S+EqIQ+mSlG5UR5/3VnMhwsm+BVXq05gGJkev2hoA+n/NREA5yEjLOcDPSYksV5h9dpt OtQNFcaE/bV24bFxHy4liEWcWHi8ADsxK1Rnmz7iBVVV9aYniCWpLujCbFy9pTIPMdkj 0AVtmZFR1A/B0GiBPUsl6ElPL1Hjhihiea1rOLNjpIWi4dSamfNWQjr28g/8dNs8dAhm ANOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=PbPy0sLFc6s1iVCDr+0Neuhg5szqPhBqV3IvM8xe9Rc=; b=V8ING5idU75m+kMG5Jd+8ajlgDHOhiX0EBeJe6XSyko3HJQSX5271r7+cSNTnYzMaz 7f2n2ZgIHmt6dTpPi9ZdYhm9GBFtxNjcKa6K+GeuIkUOgnVEwcW12P+AaUi08Tpno0at xAuwYMTG+3kZIc7xoBAa/Rin0Y6fdTpXTjx5gTGc/Wro8RDk9PYJ/CHg3KuMNcpIz0Vd nJxvvMVd9lyi4OeZIWJBMXGZ05mZwxsaYJ0bJymYlvfTA2+tcVAjQHkurWwr5Kpm7F5x FOBWyZmOQrjDsG8ugeKQkPKUy5DsYjrRUcc80Vsm6QyhIMxrS0Bw1WrGZSvyiX0ob4uw 4/eg== X-Gm-Message-State: AOAM532IhPUoCS15zAA/GOLE/WlnjSWWlUuxPDys3zn1ZoPkWXDz8c/t IEmf/VqU6EEKI1Mh82GKjYfR4jfga1wSn2vVwpeu X-Google-Smtp-Source: ABdhPJx3HkT0cnFJM6rU/xn9g9XPuNXhwJemA19TgZ/Z+YQGjVGxZ2pUb4AP1eoSda2Zuba1PC1W/lpXBbVk/1gaYhU= X-Received: by 2002:a17:906:2c54:: with SMTP id f20mr812366ejh.91.1623368345578; Thu, 10 Jun 2021 16:39:05 -0700 (PDT) MIME-Version: 1.0 References: <20210610020108.1356361-1-liushixin2@huawei.com> In-Reply-To: <20210610020108.1356361-1-liushixin2@huawei.com> From: Paul Moore Date: Thu, 10 Jun 2021 19:38:54 -0400 Message-ID: Subject: Re: [PATCH -next] netlabel: Fix memory leak in netlbl_mgmt_add_common To: Liu Shixin Cc: "David S. Miller" , Jakub Kicinski , netdev@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 9, 2021 at 9:29 PM Liu Shixin wrote: > > Hulk Robot reported memory leak in netlbl_mgmt_add_common. > The problem is non-freed map in case of netlbl_domhsh_add() failed. > > BUG: memory leak > unreferenced object 0xffff888100ab7080 (size 96): > comm "syz-executor537", pid 360, jiffies 4294862456 (age 22.678s) > hex dump (first 32 bytes): > 05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > fe 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 ................ > backtrace: > [<0000000008b40026>] netlbl_mgmt_add_common.isra.0+0xb2a/0x1b40 > [<000000003be10950>] netlbl_mgmt_add+0x271/0x3c0 > [<00000000c70487ed>] genl_family_rcv_msg_doit.isra.0+0x20e/0x320 > [<000000001f2ff614>] genl_rcv_msg+0x2bf/0x4f0 > [<0000000089045792>] netlink_rcv_skb+0x134/0x3d0 > [<0000000020e96fdd>] genl_rcv+0x24/0x40 > [<0000000042810c66>] netlink_unicast+0x4a0/0x6a0 > [<000000002e1659f0>] netlink_sendmsg+0x789/0xc70 > [<000000006e43415f>] sock_sendmsg+0x139/0x170 > [<00000000680a73d7>] ____sys_sendmsg+0x658/0x7d0 > [<0000000065cbb8af>] ___sys_sendmsg+0xf8/0x170 > [<0000000019932b6c>] __sys_sendmsg+0xd3/0x190 > [<00000000643ac172>] do_syscall_64+0x37/0x90 > [<000000009b79d6dc>] entry_SYSCALL_64_after_hwframe+0x44/0xae > > Fixes: 63c416887437 ("netlabel: Add network address selectors to the NetLabel/LSM domain mapping") > Reported-by: Hulk Robot > Signed-off-by: Liu Shixin > --- > net/netlabel/netlabel_mgmt.c | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > > diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c > index e664ab990941..e7f00c0f441e 100644 > --- a/net/netlabel/netlabel_mgmt.c > +++ b/net/netlabel/netlabel_mgmt.c > @@ -191,6 +191,12 @@ static int netlbl_mgmt_add_common(struct genl_info *info, > entry->family = AF_INET; > entry->def.type = NETLBL_NLTYPE_ADDRSELECT; > entry->def.addrsel = addrmap; > + > + ret_val = netlbl_domhsh_add(entry, audit_info); > + if (ret_val != 0) { > + kfree(map); > + goto add_free_addrmap; > + } > #if IS_ENABLED(CONFIG_IPV6) > } else if (info->attrs[NLBL_MGMT_A_IPV6ADDR]) { > struct in6_addr *addr; > @@ -243,13 +249,19 @@ static int netlbl_mgmt_add_common(struct genl_info *info, > entry->family = AF_INET6; > entry->def.type = NETLBL_NLTYPE_ADDRSELECT; > entry->def.addrsel = addrmap; > + > + ret_val = netlbl_domhsh_add(entry, audit_info); > + if (ret_val != 0) { > + kfree(map); > + goto add_free_addrmap; > + } > #endif /* IPv6 */ > + } else { > + ret_val = netlbl_domhsh_add(entry, audit_info); > + if (ret_val != 0) > + goto add_free_addrmap; > } > > - ret_val = netlbl_domhsh_add(entry, audit_info); > - if (ret_val != 0) > - goto add_free_addrmap; > - > return 0; Thanks for the report and a fix, although I think there may be a simpler fix that results in less code duplication; some quick pseudo code below: int netlbl_mgmt_add_common(...) { void *map_p = NULL; if (NLBL_MGMT_A_IPV4ADDR) { struct netlbl_domaddr4_map *map; map_p = map; } else if (NLBL_MGMT_A_IPV6ADDR) { struct netlbl_domaddr4_map *map; map_p = map; } add_free_addrmap: kfree(map_p); kfree(addrmap); } ... this approach would even simplify the error handling after the netlbl_af{4,6}list_add() calls a bit too (you could jump straight to add_free_addrmap). -- paul moore www.paul-moore.com