mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

net/ipv4: merge ip_options_get and ip_options_get_from_user

Browse source 
Use the sockptr_t type to merge the versions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-07-23 08:08:57 +02:00 committed by David S. Miller
parent 01ccb5b48f
commit de40a3e883
3 changed files with 18 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/net/ip.h
View file

@ -23,6 +23,7 @@
#include <linux/in.h> #include <linux/in.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/jhash.h> #include <linux/jhash.h>
#include <linux/sockptr.h>
#include <net/inet_sock.h> #include <net/inet_sock.h>
#include <net/route.h> #include <net/route.h>
@ -707,9 +708,7 @@ int __ip_options_compile(struct net *net, struct ip_options *opt,
int ip_options_compile(struct net *net, struct ip_options *opt, int ip_options_compile(struct net *net, struct ip_options *opt,
struct sk_buff *skb); struct sk_buff *skb);
int ip_options_get(struct net *net, struct ip_options_rcu **optp, int ip_options_get(struct net *net, struct ip_options_rcu **optp,
unsigned char *data, int optlen); sockptr_t data, int optlen);
int ip_options_get_from_user(struct net *net, struct ip_options_rcu **optp,
unsigned char __user *data, int optlen);
void ip_options_undo(struct ip_options *opt); void ip_options_undo(struct ip_options *opt);
void ip_forward_options(struct sk_buff *skb); void ip_forward_options(struct sk_buff *skb);
int ip_options_rcv_srr(struct sk_buff *skb, struct net_device *dev); int ip_options_rcv_srr(struct sk_buff *skb, struct net_device *dev);

45
net/ipv4/ip_options.c
View file

@ -519,15 +519,20 @@ void ip_options_undo(struct ip_options *opt)
} }
} }
static struct ip_options_rcu *ip_options_get_alloc(const int optlen) int ip_options_get(struct net *net, struct ip_options_rcu **optp,
sockptr_t data, int optlen)
{ {
return kzalloc(sizeof(struct ip_options_rcu) + ((optlen + 3) & ~3), struct ip_options_rcu *opt;
GFP_KERNEL);
} opt = kzalloc(sizeof(struct ip_options_rcu) + ((optlen + 3) & ~3),
GFP_KERNEL);
if (!opt)
return -ENOMEM;
if (optlen && copy_from_sockptr(opt->opt.__data, data, optlen)) {
kfree(opt);
return -EFAULT;
}
static int ip_options_get_finish(struct net *net, struct ip_options_rcu **optp,
struct ip_options_rcu *opt, int optlen)
{
while (optlen & 3) while (optlen & 3)
opt->opt.__data[optlen++] = IPOPT_END; opt->opt.__data[optlen++] = IPOPT_END;
opt->opt.optlen = optlen; opt->opt.optlen = optlen;
@ -540,32 +545,6 @@ static int ip_options_get_finish(struct net *net, struct ip_options_rcu **optp,
return 0; return 0;
} }
int ip_options_get_from_user(struct net *net, struct ip_options_rcu **optp,
unsigned char __user *data, int optlen)
{
struct ip_options_rcu *opt = ip_options_get_alloc(optlen);
if (!opt)
return -ENOMEM;
if (optlen && copy_from_user(opt->opt.__data, data, optlen)) {
kfree(opt);
return -EFAULT;
}
return ip_options_get_finish(net, optp, opt, optlen);
}
int ip_options_get(struct net *net, struct ip_options_rcu **optp,
unsigned char *data, int optlen)
{
struct ip_options_rcu *opt = ip_options_get_alloc(optlen);
if (!opt)
return -ENOMEM;
if (optlen)
memcpy(opt->opt.__data, data, optlen);
return ip_options_get_finish(net, optp, opt, optlen);
}
void ip_forward_options(struct sk_buff *skb) void ip_forward_options(struct sk_buff *skb)
{ {
struct ip_options *opt = &(IPCB(skb)->opt); struct ip_options *opt = &(IPCB(skb)->opt);

7
net/ipv4/ip_sockglue.c
View file

@ -280,7 +280,8 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,
err = cmsg->cmsg_len - sizeof(struct cmsghdr); err = cmsg->cmsg_len - sizeof(struct cmsghdr);
/* Our caller is responsible for freeing ipc->opt */ /* Our caller is responsible for freeing ipc->opt */
err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg), err = ip_options_get(net, &ipc->opt,
KERNEL_SOCKPTR(CMSG_DATA(cmsg)),
err < 40 ? err : 40); err < 40 ? err : 40);
if (err) if (err)
return err; return err;
@ -940,8 +941,8 @@ static int do_ip_setsockopt(struct sock *sk, int level,
if (optlen > 40) if (optlen > 40)
goto e_inval; goto e_inval;
err = ip_options_get_from_user(sock_net(sk), &opt, err = ip_options_get(sock_net(sk), &opt, USER_SOCKPTR(optval),
optval, optlen); optlen);
if (err) if (err)
break; break;
old = rcu_dereference_protected(inet->inet_opt, old = rcu_dereference_protected(inet->inet_opt,