lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 454/700] netfilter: nf_tables: do not allow to delete table with owner by handle
    Date
    From: Pablo Neira Ayuso <pablo@netfilter.org>

    [ Upstream commit e31f072ffab0397a328b31a9589dcf9733dc9c72 ]

    nft_table_lookup_byhandle() also needs to validate the netlink PortID
    owner when deleting a table by handle.

    Fixes: 6001a930ce03 ("netfilter: nftables: introduce table ownership")
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nf_tables_api.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
    index 3705086d43f5..6b79fa357bfe 100644
    --- a/net/netfilter/nf_tables_api.c
    +++ b/net/netfilter/nf_tables_api.c
    @@ -533,14 +533,19 @@ static struct nft_table *nft_table_lookup(const struct net *net,

    static struct nft_table *nft_table_lookup_byhandle(const struct net *net,
    const struct nlattr *nla,
    - u8 genmask)
    + u8 genmask, u32 nlpid)
    {
    struct nft_table *table;

    list_for_each_entry(table, &net->nft.tables, list) {
    if (be64_to_cpu(nla_get_be64(nla)) == table->handle &&
    - nft_active_genmask(table, genmask))
    + nft_active_genmask(table, genmask)) {
    + if (nft_table_has_owner(table) &&
    + nlpid && table->nlpid != nlpid)
    + return ERR_PTR(-EPERM);
    +
    return table;
    + }
    }

    return ERR_PTR(-ENOENT);
    @@ -1213,7 +1218,8 @@ static int nf_tables_deltable(struct net *net, struct sock *nlsk,

    if (nla[NFTA_TABLE_HANDLE]) {
    attr = nla[NFTA_TABLE_HANDLE];
    - table = nft_table_lookup_byhandle(net, attr, genmask);
    + table = nft_table_lookup_byhandle(net, attr, genmask,
    + NETLINK_CB(skb).portid);
    } else {
    attr = nla[NFTA_TABLE_NAME];
    table = nft_table_lookup(net, attr, family, genmask,
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:10    [W:3.786 / U:0.568 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site