diff options
| author | Will Drewry <wad@chromium.org> | 2012-04-12 16:47:53 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-04-14 11:13:19 +1000 |
| commit | 0c5fe1b4221c6701224c2601cf3c692e5721103e (patch) | |
| tree | 6b90e50a543b559199c3cea4c104931d605d6eeb | |
| parent | 46b325c7eb01482674406701825ff67f561ccdd4 (diff) | |
| download | op-kernel-dev-0c5fe1b4221c6701224c2601cf3c692e5721103e.zip op-kernel-dev-0c5fe1b4221c6701224c2601cf3c692e5721103e.tar.gz | |
net/compat.c,linux/filter.h: share compat_sock_fprog
Any other users of bpf_*_filter that take a struct sock_fprog from
userspace will need to be able to also accept a compat_sock_fprog
if the arch supports compat calls. This change allows the existing
compat_sock_fprog be shared.
Signed-off-by: Will Drewry <wad@chromium.org>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Eric Paris <eparis@redhat.com>
v18: tasered by the apostrophe police
v14: rebase/nochanges
v13: rebase on to 88ebdda6159ffc15699f204c33feb3e431bf9bdc
v12: rebase on to linux-next
v11: introduction
Signed-off-by: James Morris <james.l.morris@oracle.com>
| -rw-r--r-- | include/linux/filter.h | 11 | ||||
| -rw-r--r-- | net/compat.c | 8 |
2 files changed, 11 insertions, 8 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index aaa2e80..f2e5315 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -10,6 +10,7 @@ #ifdef __KERNEL__ #include <linux/atomic.h> +#include <linux/compat.h> #endif /* @@ -132,6 +133,16 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ #ifdef __KERNEL__ +#ifdef CONFIG_COMPAT +/* + * A struct sock_filter is architecture independent. + */ +struct compat_sock_fprog { + u16 len; + compat_uptr_t filter; /* struct sock_filter * */ +}; +#endif + struct sk_buff; struct sock; diff --git a/net/compat.c b/net/compat.c index e055708..242c828 100644 --- a/net/compat.c +++ b/net/compat.c @@ -328,14 +328,6 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm) __scm_destroy(scm); } -/* - * A struct sock_filter is architecture independent. - */ -struct compat_sock_fprog { - u16 len; - compat_uptr_t filter; /* struct sock_filter * */ -}; - static int do_set_attach_filter(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) { |
