projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'vfio-v5.11-rc1' of git://github.com/awilliam/linux-vfio
[linux-2.6-microblaze.git]
/
net
/
netfilter
/
nft_cmp.c
diff --git
a/net/netfilter/nft_cmp.c
b/net/netfilter/nft_cmp.c
index
bc079d6
..
00e563a
100644
(file)
--- a/
net/netfilter/nft_cmp.c
+++ b/
net/netfilter/nft_cmp.c
@@
-123,11
+123,11
@@
static int __nft_cmp_offload(struct nft_offload_ctx *ctx,
u8 *mask = (u8 *)&flow->match.mask;
u8 *key = (u8 *)&flow->match.key;
u8 *mask = (u8 *)&flow->match.mask;
u8 *key = (u8 *)&flow->match.key;
- if (priv->op != NFT_CMP_EQ ||
reg->len != priv
->len)
+ if (priv->op != NFT_CMP_EQ ||
priv->len > reg
->len)
return -EOPNOTSUPP;
return -EOPNOTSUPP;
- memcpy(key + reg->offset, &priv->data,
priv
->len);
- memcpy(mask + reg->offset, ®->mask,
priv
->len);
+ memcpy(key + reg->offset, &priv->data,
reg
->len);
+ memcpy(mask + reg->offset, ®->mask,
reg
->len);
flow->match.dissector.used_keys |= BIT(reg->key);
flow->match.dissector.offset[reg->key] = reg->base_offset;
flow->match.dissector.used_keys |= BIT(reg->key);
flow->match.dissector.offset[reg->key] = reg->base_offset;
@@
-137,7
+137,7
@@
static int __nft_cmp_offload(struct nft_offload_ctx *ctx,
nft_reg_load16(priv->data.data) != ARPHRD_ETHER)
return -EOPNOTSUPP;
nft_reg_load16(priv->data.data) != ARPHRD_ETHER)
return -EOPNOTSUPP;
- nft_offload_update_dependency(ctx, &priv->data,
priv
->len);
+ nft_offload_update_dependency(ctx, &priv->data,
reg
->len);
return 0;
}
return 0;
}