lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETNS]: Add namespace parameter to ip_options_get(...).

Browse Source 
Pass the init_net there for now.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-03-24 15:29:55 -07:00
committed by David S. Miller
parent 0e6bd4a1c6
commit f2c4802b3f
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/ip_sockglue.c
View File

@@ -176,7 +176,7 @@ int ip_cmsg_send(struct msghdr *msg, struct ipcm_cookie *ipc)
switch (cmsg->cmsg_type) {
case IP_RETOPTS:
err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr));
err = ip_options_get(&ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40);
err = ip_options_get(&init_net, &ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40);
if (err)
return err;
break;
@@ -449,7 +449,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
struct ip_options * opt = NULL;
if (optlen > 40 || optlen < 0)
goto e_inval;
err = ip_options_get_from_user(&opt, optval, optlen);
err = ip_options_get_from_user(&init_net, &opt, optval, optlen);
if (err)
break;
if (inet->is_icsk) {