]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
secmark: do not return early if there was no error
authorEric Paris <eparis@redhat.com>
Tue, 12 Oct 2010 15:40:08 +0000 (11:40 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 22 Nov 2010 19:03:17 +0000 (11:03 -0800)
commit6bd415f814fe58a973d494c0669c09c8bacdf8f4
treef32897b49d303d219f62eb2bf61cc9f5ab4334bb
parent9c1560611de6c695d146f9b4e78d576d3338b1ed
secmark: do not return early if there was no error

commit 15714f7b58011cf3948cab2988abea560240c74f upstream.

Commit 4a5a5c73 attempted to pass decent error messages back to userspace for
netfilter errors.  In xt_SECMARK.c however the patch screwed up and returned
on 0 (aka no error) early and didn't finish setting up secmark.  This results
in a kernel BUG if you use SECMARK.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/netfilter/xt_SECMARK.c