netfilter: xt_socket: enable defrag after all other checks
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: xt_socket: enable defrag after all other checks
Originally this did not matter because defag was enabled once per namespace and only disabled again on netns dismantle. When this got changed I should have adjusted checkentry to not leve defrag enabled on error.
Fixes de8c12110a13 ("netfilter: disable defrag once its no longer needed")
Signed-off-by Florian Westphal <[email protected]>
---
Targetting nf-next because this isn't a regression per se.
net/netfilter/xt_socket.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)
net/netfilter/xt_socket.c +6 -17
@@ -168,52 +168,41 @@ static int socket_mt_enable_defrag(struct net *net, int family)static int socket_mt_v1_check (const struct xt_mtchk_param *par) {const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo; -int err; - - err =socket_mt_enable_defrag (par->net, par->family); -if (err) -return err;if (info->flags & ~XT_SOCKET_FLAGS_V1 ) {pr_info_ratelimited ("unknown flags 0x%x\n" , info->flags & ~XT_SOCKET_FLAGS_V1 );return -EINVAL ; } -return 0 ; + +return socket_mt_enable_defrag (par->net, par->family); }static int socket_mt_v2_check (const struct xt_mtchk_param *par) {const struct xt_socket_mtinfo2 *info = (struct xt_socket_mtinfo2 *) par->matchinfo; -int err; - - err =socket_mt_enable_defrag (par->net, par->family); -if (err) -return err;if (info->flags & ~XT_SOCKET_FLAGS_V2 ) {pr_info_ratelimited ("unknown flags 0x%x\n" , info->flags & ~XT_SOCKET_FLAGS_V2 );return -EINVAL ; } -return 0 ; + +return socket_mt_enable_defrag (par->net, par->family); }static int socket_mt_v3_check (const struct xt_mtchk_param *par) {const struct xt_socket_mtinfo3 *info = (struct xt_socket_mtinfo3 *)par->matchinfo; -int err; - err =socket_mt_enable_defrag (par->net, par->family); -if (err) -return err;if (info->flags & ~XT_SOCKET_FLAGS_V3 ) {pr_info_ratelimited ("unknown flags 0x%x\n" , info->flags & ~XT_SOCKET_FLAGS_V3 );return -EINVAL ; } -return 0 ; + +return socket_mt_enable_defrag (par->net, par->family); }static void socket_mt_destroy (const struct xt_mtdtor_param *par)
Signature · 1 line
2.53.0