From: ebiederm@xmission•com (Eric W. Biederman)
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, netdev@markandruth•co.uk,
eric.dumazet@gmail•com, Tom Herbert <therbert@google•com>
Subject: [PATCH net-next] ipv6: Fix inet6_csk_bind_conflict so it builds with user namespaces enabled
Date: Tue, 29 Jan 2013 04:16:18 -0800 [thread overview]
Message-ID: <871ud4chgt.fsf@xmission.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1301201542470.2060@pokey.mtv.corp.google.com> (Tom Herbert's message of "Sun, 20 Jan 2013 16:07:48 -0800 (PST)")
When attempting to build linux-next with user namespaces enabled I ran
into this fun build error.
CC net/ipv6/inet6_connection_sock.o
.../net/ipv6/inet6_connection_sock.c: In function ‘inet6_csk_bind_conflict’:
.../net/ipv6/inet6_connection_sock.c:37:12: error: incompatible types when initializing type ‘int’ using
type ‘kuid_t’
.../net/ipv6/inet6_connection_sock.c:54:30: error: incompatible type for argument 1 of ‘uid_eq’
.../include/linux/uidgid.h:48:20: note: expected ‘kuid_t’ but argument is of type ‘int’
make[3]: *** [net/ipv6/inet6_connection_sock.o] Error 1
make[2]: *** [net/ipv6] Error 2
make[2]: *** Waiting for unfinished jobs....
Using kuid_t instead of int to hold the uid fixes this.
Cc: Tom Herbert <therbert@google•com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission•com>
---
net/ipv6/inet6_connection_sock.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index e4297a3..b386a2c 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -34,7 +34,7 @@ int inet6_csk_bind_conflict(const struct sock *sk,
const struct hlist_node *node;
int reuse = sk->sk_reuse;
int reuseport = sk->sk_reuseport;
- int uid = sock_i_uid((struct sock *)sk);
+ kuid_t uid = sock_i_uid((struct sock *)sk);
/* We must walk the whole port owner list in this case. -DaveM */
/*
--
1.7.5.4
next prev parent reply other threads:[~2013-01-29 12:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 0:07 [PATCH 4/5 v2] soreuseport: TCP/IPv6 implementation Tom Herbert
2013-01-29 12:16 ` Eric W. Biederman [this message]
2013-01-29 20:20 ` [PATCH net-next] ipv6: Fix inet6_csk_bind_conflict so it builds with user namespaces enabled David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871ud4chgt.fsf@xmission.com \
--to=ebiederm@xmission$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=netdev@markandruth$(echo .)co.uk \
--cc=netdev@vger$(echo .)kernel.org \
--cc=therbert@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox