tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[NETFILTER]: ctnetlink: fix leak in ctnetlink_create_conntrack error path

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Patrick McHardy and committed by David S. Miller c54ea3b9 334c8556

+2 -2
unified split
+1 -1
net/ipv4/netfilter/ip_conntrack_netlink.c
··· 959 if (cda[CTA_PROTOINFO-1]) { 960 err = ctnetlink_change_protoinfo(ct, cda); 961 if (err < 0) 962 - return err; 963 } 964 965 #if defined(CONFIG_IP_NF_CONNTRACK_MARK)
··· 959 if (cda[CTA_PROTOINFO-1]) { 960 err = ctnetlink_change_protoinfo(ct, cda); 961 if (err < 0) 962 + goto err; 963 } 964 965 #if defined(CONFIG_IP_NF_CONNTRACK_MARK)
+1 -1
net/netfilter/nf_conntrack_netlink.c
··· 981 if (cda[CTA_PROTOINFO-1]) { 982 err = ctnetlink_change_protoinfo(ct, cda); 983 if (err < 0) 984 - return err; 985 } 986 987 #if defined(CONFIG_NF_CONNTRACK_MARK)
··· 981 if (cda[CTA_PROTOINFO-1]) { 982 err = ctnetlink_change_protoinfo(ct, cda); 983 if (err < 0) 984 + goto err; 985 } 986 987 #if defined(CONFIG_NF_CONNTRACK_MARK)