netfilter: ctnetlink: use helper function to calculate expect ID
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: ctnetlink: use helper function to calculate expect ID
Delete expectation path is missing a call to the nf_expect_get_id() helper function to calculate the expectation ID, otherwise LSB of the expectation object address is leaked to userspace.
Fixes 3c79107631db ("netfilter: ctnetlink: don't use conntrack/expect object addresses as id")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_conntrack_netlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_conntrack_netlink.c +2 -1
@@ -3420,7 +3420,8 @@ static int ctnetlink_del_expect(struct sk_buff *skb,if (cda[CTA_EXPECT_ID ]) {__be32 id =nla_get_be32 (cda[CTA_EXPECT_ID ]); -if (ntohl (id) != (u32 )(unsigned long )exp) { + +if (id !=nf_expect_get_id (exp)) {nf_ct_expect_put (exp);return -ENOENT ; }
Signature · 1 line
2.30.2