Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40188a25 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers 



[ Upstream commit 7931d32955e09d0a11b1fe0b6aac1bfa061c005c ]

register store validation for NFT_DATA_VALUE is conditional, however,
the datatype is always either NFT_DATA_VALUE or NFT_DATA_VERDICT. This
only requires a new helper function to infer the register type from the
set datatype so this conditional check can be removed. Otherwise,
pointer to chain object can be leaked through the registers.

Fixes: 96518518 ("netfilter: add nftables")
Reported-by: default avatarLinus Torvalds <torvalds@linuxfoundation.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ae81535c

include/net/netfilter/nf_tables.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -445,6 +445,11 @@ static inline void *nft_set_priv(const struct nft_set *set) 
	return (void *)set->data;

	return (void *)set->data;

}

}





static inline enum nft_data_types nft_set_datatype(const struct nft_set *set)

{

	return set->dtype == NFT_DATA_VERDICT ? NFT_DATA_VERDICT : NFT_DATA_VALUE;

}



static inline bool nft_set_gc_is_pending(const struct nft_set *s)

static inline bool nft_set_gc_is_pending(const struct nft_set *s)

{

{

	return refcount_read(&s->refs) != 1;

	return refcount_read(&s->refs) != 1;

net/netfilter/nf_tables_api.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -4154,8 +4154,7 @@ static int nf_tables_fill_setelem(struct sk_buff *skb, 




	if (nft_set_ext_exists(ext, NFT_SET_EXT_DATA) &&

	if (nft_set_ext_exists(ext, NFT_SET_EXT_DATA) &&

	    nft_data_dump(skb, NFTA_SET_ELEM_DATA, nft_set_ext_data(ext),

	    nft_data_dump(skb, NFTA_SET_ELEM_DATA, nft_set_ext_data(ext),

			  set->dtype == NFT_DATA_VERDICT ? NFT_DATA_VERDICT : NFT_DATA_VALUE,

			  nft_set_datatype(set), set->dlen) < 0)

			  set->dlen) < 0)

		goto nla_put_failure;

		goto nla_put_failure;





	if (nft_set_ext_exists(ext, NFT_SET_EXT_EXPR) &&

	if (nft_set_ext_exists(ext, NFT_SET_EXT_EXPR) &&
@@ -7655,6 +7654,9 @@ static int nft_validate_register_store(const struct nft_ctx *ctx, 




		return 0;

		return 0;

	default:

	default:

		if (type != NFT_DATA_VALUE)

			return -EINVAL;



		if (reg < NFT_REG_1 * NFT_REG_SIZE / NFT_REG32_SIZE)

		if (reg < NFT_REG_1 * NFT_REG_SIZE / NFT_REG32_SIZE)

			return -EINVAL;

			return -EINVAL;

		if (len == 0)

		if (len == 0)
@@ -7663,8 +7665,6 @@ static int nft_validate_register_store(const struct nft_ctx *ctx, 
		    FIELD_SIZEOF(struct nft_regs, data))

		    FIELD_SIZEOF(struct nft_regs, data))

			return -ERANGE;

			return -ERANGE;





		if (data != NULL && type != NFT_DATA_VALUE)

			return -EINVAL;

		return 0;

		return 0;

	}

	}

}

}

net/netfilter/nft_lookup.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -101,7 +101,8 @@ static int nft_lookup_init(const struct nft_ctx *ctx, 
			return -EINVAL;

			return -EINVAL;





		err = nft_parse_register_store(ctx, tb[NFTA_LOOKUP_DREG],

		err = nft_parse_register_store(ctx, tb[NFTA_LOOKUP_DREG],

					       &priv->dreg, NULL, set->dtype,

					       &priv->dreg, NULL,

					       nft_set_datatype(set),

					       set->dlen);

					       set->dlen);

		if (err < 0)

		if (err < 0)

			return err;

			return err;