From: David S. Miller Date: Tue, 19 Jun 2012 03:26:06 +0000 (-0700) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf-next X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~18534^2~520 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6bdc5f49e365a5403b9fdef01ceb37241ab00f9b;p=mirror_ubuntu-focal-kernel.git Merge branch 'master' of git://1984.lsi.us.es/nf-next Pablo says: ==================== The following patchset provides fixes for issues that were recently introduced by my new cthelper infrastructure. They have been spotted by Randy Dunlap, Andrew Morton and Dan Carpenter. The patches provide: * compilation fixes if CONFIG_NF_CONNTRACK is disabled: I moved all the conntrack code from nfnetlink_queue.c to nfnetlink_queue_ct.c to avoid peppering the entire code with lots of ifdefs. I needed to rename nfnetlink_queue.c to nfnetlink_queue_core.c to get it working with the Makefile tweaks I've added. * fix NULL pointer dereference via ctnetlink while trying to change the helper for an existing conntrack entry. I don't find any reasonable use case for changing the helper from one to another in run-time. Thus, now ctnetlink returns -EOPNOTSUPP for this operation. * fix possible out-of-bound zeroing of the conntrack extension area due to the helper automatic assignation routine. ==================== Signed-off-by: David S. Miller --- 6bdc5f49e365a5403b9fdef01ceb37241ab00f9b