Commit ed13998c authored Jun 05, 2013 by Nicolas Dichtel Committed by David S. Miller Jun 10, 2013

sock_diag: fix filter code sent to userspace

Filters need to be translated to real BPF code for userland, like SO_GETFILTER.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 92bb73ea

include/linux/filter.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@ extern int sk_attach_filter(struct sock_fprog fprog, struct sock sk);
	extern int sk_detach_filter(struct sock *sk);		extern int sk_detach_filter(struct sock *sk);
	extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);		extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
	extern int sk_get_filter(struct sock sk, struct sock_filter __user filter, unsigned len);		extern int sk_get_filter(struct sock sk, struct sock_filter __user filter, unsigned len);
			extern void sk_decode_filter(struct sock_filter filt, struct sock_filter to);

	#ifdef CONFIG_BPF_JIT		#ifdef CONFIG_BPF_JIT
	#include <stdarg.h>		#include <stdarg.h>

net/core/filter.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -778,7 +778,7 @@ int sk_detach_filter(struct sock *sk)
	}		}
	EXPORT_SYMBOL_GPL(sk_detach_filter);		EXPORT_SYMBOL_GPL(sk_detach_filter);

	static void sk_decode_filter(struct sock_filter filt, struct sock_filter to)		void sk_decode_filter(struct sock_filter filt, struct sock_filter to)
	{		{
	static const u16 decodes[] = {		static const u16 decodes[] = {
	[BPF_S_ALU_ADD_K] = BPF_ALU\|BPF_ADD\|BPF_K,		[BPF_S_ALU_ADD_K] = BPF_ALU\|BPF_ADD\|BPF_K,

net/core/sock_diag.c

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,8 +73,13 @@ int sock_diag_put_filterinfo(struct user_namespace user_ns, struct sock sk,
	goto out;		goto out;
	}		}

	if (filter)		if (filter) {
	memcpy(nla_data(attr), filter->insns, len);		struct sock_filter fb = (struct sock_filter )nla_data(attr);
			int i;

			for (i = 0; i < filter->len; i++, fb++)
			sk_decode_filter(&filter->insns[i], fb);
			}

	out:		out:
	rcu_read_unlock();		rcu_read_unlock();