From patchwork Tue Jul 13 13:03:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 12373901 X-Patchwork-Delegate: kuba@kernel.org 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 3D37CC07E96 for ; Tue, 13 Jul 2021 13:04:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A88560240 for ; Tue, 13 Jul 2021 13:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236494AbhGMNGz (ORCPT ); Tue, 13 Jul 2021 09:06:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236249AbhGMNGx (ORCPT ); Tue, 13 Jul 2021 09:06:53 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 902F3C0613DD; Tue, 13 Jul 2021 06:04:02 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id k20so14581458pgg.7; Tue, 13 Jul 2021 06:04:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wICO7mAwhqJD1edb3nvOclBABQKgJ4d++G/031aYfk4=; b=NeSEYEwpwaMAY/u6wfT8YqxYJ29jDeD4nKlvqwUM2Q2EhDJhGPqnAJL7BXdPCC6YdD XkDaCKAWWILQJkAQG32yIaGA6opOub7y7pgqeaQOxxBgJlqElvz1PAMQINvdgzlgu5mi EcRgCskZ56y6pKWRQRoQ68lK0iBp5vdb9jVecO/RlowkRnxISCaz1EnLSL5lnTkoMkoK hhq4+N2HO2HyudtZyuEoR92SLtA7bbU/sdKgr7M/xYQ/Q4X4/KmUhoPCP2lbZhhTRZTA MJk4spuP6i+GyS2+YhdYkCOqPu3XcAsXrOQieeByWWQ7+8WG5J6mfkM/kODxrpClgYbD 9bJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wICO7mAwhqJD1edb3nvOclBABQKgJ4d++G/031aYfk4=; b=QenehPU+/eEtkT12s0KmDsdJnrtuuyCGHBs5NvQ1kv7DQOirkGzSLD8hM1ddj2T586 SztqzrhLm8jcciXetuiu+N+HSS3VNt+jpPREhXiZe76ZmTEN6mgEp0Us4T2EEimo5b3M lxnnMQPTGmW0JuLm85xvIqK3reGeQ3yG6GQIPKThYOdG5ZyBMKt3/fJ6+qJfrbDru5P2 EChGb/WSFzLxMB5XRRav1hqKt/J3M4oi7RtiTD+WJXwVzpTlZOPN/eWuFjarC/Wff3at SGE2+EICJrHetMH4Mif6F0Dkcr/cBVjlakgJGXorX0LjZyNe4IJIc2KLRinybaZnthl/ AhGg== X-Gm-Message-State: AOAM532HpTmuQy2Bih1tFb3cSry77RNKf2PUSTevHwwIFS2ZLM6733YL ZG+MWU/okno9xE39zfmItPg= X-Google-Smtp-Source: ABdhPJxHvb2e9OGV+rWBRwtvIifXpJ70kyVgCHmlO0ZAbHm20/q1TEey5dmlakW8q1Gl8ileAPwlyg== X-Received: by 2002:a63:f64d:: with SMTP id u13mr4256994pgj.156.1626181441973; Tue, 13 Jul 2021 06:04:01 -0700 (PDT) Received: from localhost.localdomain ([154.16.166.218]) by smtp.gmail.com with ESMTPSA id w2sm3184238pjf.2.2021.07.13.06.03.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jul 2021 06:04:01 -0700 (PDT) From: Dongliang Mu To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Jakub Kicinski , Richard Guy Briggs , Paul Moore Cc: Dongliang Mu , syzbot , kernel test robot , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] audit: fix memory leak in nf_tables_commit Date: Tue, 13 Jul 2021 21:03:44 +0800 Message-Id: <20210713130344.473646-1-mudongliangabcd@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org In nf_tables_commit, if nf_tables_commit_audit_alloc fails, it does not free the adp variable. Fix this by freeing the linked list with head adl. backtrace: kmalloc include/linux/slab.h:591 [inline] kzalloc include/linux/slab.h:721 [inline] nf_tables_commit_audit_alloc net/netfilter/nf_tables_api.c:8439 [inline] nf_tables_commit+0x16e/0x1760 net/netfilter/nf_tables_api.c:8508 nfnetlink_rcv_batch+0x512/0xa80 net/netfilter/nfnetlink.c:562 nfnetlink_rcv_skb_batch net/netfilter/nfnetlink.c:634 [inline] nfnetlink_rcv+0x1fa/0x220 net/netfilter/nfnetlink.c:652 netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline] netlink_unicast+0x2c7/0x3e0 net/netlink/af_netlink.c:1340 netlink_sendmsg+0x36b/0x6b0 net/netlink/af_netlink.c:1929 sock_sendmsg_nosec net/socket.c:702 [inline] sock_sendmsg+0x56/0x80 net/socket.c:722 Reported-by: syzbot Reported-by: kernel test robot Fixes: c520292f29b8 ("audit: log nftables configuration change events once per table") Signed-off-by: Dongliang Mu --- v1->v2: fix the compile issue net/netfilter/nf_tables_api.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 390d4466567f..7f45b291be13 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -8444,6 +8444,16 @@ static int nf_tables_commit_audit_alloc(struct list_head *adl, return 0; } +static void nf_tables_commit_free(struct list_head *adl) +{ + struct nft_audit_data *adp, *adn; + + list_for_each_entry_safe(adp, adn, adl, list) { + list_del(&adp->list); + kfree(adp); + } +} + static void nf_tables_commit_audit_collect(struct list_head *adl, struct nft_table *table, u32 op) { @@ -8508,6 +8518,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb) ret = nf_tables_commit_audit_alloc(&adl, trans->ctx.table); if (ret) { nf_tables_commit_chain_prepare_cancel(net); + nf_tables_commit_free(&adl); return ret; } if (trans->msg_type == NFT_MSG_NEWRULE || @@ -8517,6 +8528,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb) ret = nf_tables_commit_chain_prepare(net, chain); if (ret < 0) { nf_tables_commit_chain_prepare_cancel(net); + nf_tables_commit_free(&adl); return ret; } }