diff options
author | Will Drewry <wad@chromium.org> | 2012-04-12 17:47:53 -0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2012-04-13 21:13:19 -0400 |
commit | 0c5fe1b4221c6701224c2601cf3c692e5721103e (patch) | |
tree | 6b90e50a543b559199c3cea4c104931d605d6eeb /net/compat.c | |
parent | 46b325c7eb01482674406701825ff67f561ccdd4 (diff) |
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>
Diffstat (limited to 'net/compat.c')
-rw-r--r-- | net/compat.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/compat.c b/net/compat.c index e055708b8ec9..242c828810ff 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) | |||
328 | __scm_destroy(scm); | 328 | __scm_destroy(scm); |
329 | } | 329 | } |
330 | 330 | ||
331 | /* | ||
332 | * A struct sock_filter is architecture independent. | ||
333 | */ | ||
334 | struct compat_sock_fprog { | ||
335 | u16 len; | ||
336 | compat_uptr_t filter; /* struct sock_filter * */ | ||
337 | }; | ||
338 | |||
339 | static int do_set_attach_filter(struct socket *sock, int level, int optname, | 331 | static int do_set_attach_filter(struct socket *sock, int level, int optname, |
340 | char __user *optval, unsigned int optlen) | 332 | char __user *optval, unsigned int optlen) |
341 | { | 333 | { |