diff options
author | Patrick McHardy <kaber@trash.net> | 2015-04-11 02:27:38 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-04-13 17:17:30 +0200 |
commit | d0a11fc3dc4ab4c717642c9c15c8ad1cbc00d2ec (patch) | |
tree | d3dca65a7ca6c2e95b11d9dd108bdeec660b957c /net/netfilter/nft_bitwise.c | |
parent | 49499c3e6e18b7677a63316f3ff54a16533dc28f (diff) | |
download | linux-stable-d0a11fc3dc4ab4c717642c9c15c8ad1cbc00d2ec.tar.gz linux-stable-d0a11fc3dc4ab4c717642c9c15c8ad1cbc00d2ec.tar.bz2 linux-stable-d0a11fc3dc4ab4c717642c9c15c8ad1cbc00d2ec.zip |
netfilter: nf_tables: support variable sized data in nft_data_init()
Add a size argument to nft_data_init() and pass in the available space.
This will be used by the following patches to support variable sized
set element data.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nft_bitwise.c')
-rw-r--r-- | net/netfilter/nft_bitwise.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netfilter/nft_bitwise.c b/net/netfilter/nft_bitwise.c index f1a9be2aecd1..d71cc18fa35d 100644 --- a/net/netfilter/nft_bitwise.c +++ b/net/netfilter/nft_bitwise.c @@ -73,13 +73,15 @@ static int nft_bitwise_init(const struct nft_ctx *ctx, if (err < 0) return err; - err = nft_data_init(NULL, &priv->mask, &d1, tb[NFTA_BITWISE_MASK]); + err = nft_data_init(NULL, &priv->mask, sizeof(priv->mask), &d1, + tb[NFTA_BITWISE_MASK]); if (err < 0) return err; if (d1.len != priv->len) return -EINVAL; - err = nft_data_init(NULL, &priv->xor, &d2, tb[NFTA_BITWISE_XOR]); + err = nft_data_init(NULL, &priv->xor, sizeof(priv->xor), &d2, + tb[NFTA_BITWISE_XOR]); if (err < 0) return err; if (d2.len != priv->len) |