diff options
| author | Will Drewry <wad@chromium.org> | 2012-02-22 10:59:31 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-25 12:17:09 -0600 |
| commit | 9262eb710b30f37b83f517836f73a2c35b764dd0 (patch) | |
| tree | cd321c7b5370a12ff745a1978938bf890c3d3251 /net | |
| parent | 4cc797119cc5abc089c6984b3e7134cad1c8a326 (diff) | |
UBUNTU: SAUCE: SECCOMP: 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 let's the existing
compat_sock_fprog be shared.
v14: rebase/nochanges
v13: rebase on to 88ebdda6159ffc15699f204c33feb3e431bf9bdc
v12: rebase on to linux-next
v11: introduction
Signed-off-by: Will Drewry <wad@chromium.org>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Kees Cook <kees@ubuntu.com>
Diffstat (limited to 'net')
| -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 e055708b8ec..242c828810f 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) { |