41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sun, 01 Jun 2014 20:38:59 +0100
|
|
Subject: sockdiag: Avoid ABI change in 3.14.5
|
|
|
|
Add the user_namespace parameter back to sock_diag_put_filterinfo(),
|
|
but don't use it there.
|
|
|
|
--- a/include/linux/sock_diag.h
|
|
+++ b/include/linux/sock_diag.h
|
|
@@ -23,7 +23,7 @@ int sock_diag_check_cookie(void *sk, __u
|
|
void sock_diag_save_cookie(void *sk, __u32 *cookie);
|
|
|
|
int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr);
|
|
-int sock_diag_put_filterinfo(struct sock *sk,
|
|
+int sock_diag_put_filterinfo(struct user_namespace *user_ns, struct sock *sk,
|
|
struct sk_buff *skb, int attrtype);
|
|
|
|
#endif
|
|
--- a/net/core/sock_diag.c
|
|
+++ b/net/core/sock_diag.c
|
|
@@ -49,7 +49,7 @@ int sock_diag_put_meminfo(struct sock *s
|
|
}
|
|
EXPORT_SYMBOL_GPL(sock_diag_put_meminfo);
|
|
|
|
-int sock_diag_put_filterinfo(struct sock *sk,
|
|
+int sock_diag_put_filterinfo(struct user_namespace *user_ns __always_unused, struct sock *sk,
|
|
struct sk_buff *skb, int attrtype)
|
|
{
|
|
struct nlattr *attr;
|
|
--- a/net/packet/diag.c
|
|
+++ b/net/packet/diag.c
|
|
@@ -172,7 +172,7 @@ static int sk_diag_fill(struct sock *sk,
|
|
goto out_nlmsg_trim;
|
|
|
|
if ((req->pdiag_show & PACKET_SHOW_FILTER) &&
|
|
- sock_diag_put_filterinfo(sk, skb, PACKET_DIAG_FILTER))
|
|
+ sock_diag_put_filterinfo(user_ns, sk, skb, PACKET_DIAG_FILTER))
|
|
goto out_nlmsg_trim;
|
|
|
|
return nlmsg_end(skb, nlh);
|