netfilter: conntrack: call nf_ct_gre_keymap_destroy() if master helper is pptp

Browse source

[ Upstream commit b0f02608fb ]

For GRE flows, validate that the ct master helper (if any) is pptp
before calling nf_ct_gre_keymap_destroy(), so the helper data area
can be accessed safely. Note that only the pptp helper provides a
.destroy callback.

Fixes: e56894356f ("netfilter: conntrack: remove l4proto destroy hook")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Pablo Neira Ayuso 2026-06-04 08:21:13 +02:00 • committed by Greg Kroah-Hartman

parent 5ef34156d6

commit ad38166cb1

1 changed files with 16 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

18

net/netfilter/nf_conntrack_core.c

View file