Commit ed13998c authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

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: default avatarNicolas Dichtel <>
Signed-off-by: default avatarDavid S. Miller <>
parent 92bb73ea
......@@ -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_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 void sk_decode_filter(struct sock_filter *filt, struct sock_filter *to);
#include <stdarg.h>
......@@ -778,7 +778,7 @@ int sk_detach_filter(struct sock *sk)
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[] = {
......@@ -73,8 +73,13 @@ int sock_diag_put_filterinfo(struct user_namespace *user_ns, struct sock *sk,
goto out;
if (filter)
memcpy(nla_data(attr), filter->insns, len);
if (filter) {
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);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment