redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net: avoid use IPCB in cipso_v4_error 

Extract IP options in cipso_v4_error and use __icmp_send.

Signed-off-by: Sergey Nazarov <s-nazarov@yandex.ru>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Nazarov Sergey 2019-02-25 19:27:15 +03:00 committed by David S. Miller
parent 9ef6b42ad6
commit 3da1ed7ac3
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/ip.h
View File

@ -667,6 +667,8 @@ static inline int ip_options_echo(struct net *net, struct ip_options *dopt,
} }
void ip_options_fragment(struct sk_buff *skb); void ip_options_fragment(struct sk_buff *skb);
int __ip_options_compile(struct net *net, struct ip_options *opt,
struct sk_buff *skb, __be32 *info);
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,

17
net/ipv4/cipso_ipv4.c
View File

@ -1735,13 +1735,26 @@ validate_return:
*/ */
void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway) void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway)
{ {
unsigned char optbuf[sizeof(struct ip_options) + 40];
struct ip_options *opt = (struct ip_options *)optbuf;
if (ip_hdr(skb)->protocol == IPPROTO_ICMP || error != -EACCES) if (ip_hdr(skb)->protocol == IPPROTO_ICMP || error != -EACCES)
return; return;
/*
* We might be called above the IP layer,
* so we can not use icmp_send and IPCB here.
*/
memset(opt, 0, sizeof(struct ip_options));
opt->optlen = ip_hdr(skb)->ihl*4 - sizeof(struct iphdr);
if (__ip_options_compile(dev_net(skb->dev), opt, skb, NULL))
return;
if (gateway) if (gateway)
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_NET_ANO, 0); __icmp_send(skb, ICMP_DEST_UNREACH, ICMP_NET_ANO, 0, opt);
else else
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_ANO, 0); __icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_ANO, 0, opt);
} }
/** /**

22
net/ipv4/ip_options.c
View File

@ -251,8 +251,9 @@ static void spec_dst_fill(__be32 *spec_dst, struct sk_buff *skb)
* If opt == NULL, then skb->data should point to IP header. * If opt == NULL, then skb->data should point to IP header.
*/ */
int ip_options_compile(struct net *net, int __ip_options_compile(struct net *net,
struct ip_options *opt, struct sk_buff *skb) struct ip_options *opt, struct sk_buff *skb,
__be32 *info)
{ {
__be32 spec_dst = htonl(INADDR_ANY); __be32 spec_dst = htonl(INADDR_ANY);
unsigned char *pp_ptr = NULL; unsigned char *pp_ptr = NULL;
@ -468,11 +469,22 @@ eol:
return 0; return 0;
error: error:
if (skb) { if (info)
icmp_send(skb, ICMP_PARAMETERPROB, 0, htonl((pp_ptr-iph)<<24)); *info = htonl((pp_ptr-iph)<<24);
}
return -EINVAL; return -EINVAL;
} }
int ip_options_compile(struct net *net,
struct ip_options *opt, struct sk_buff *skb)
{
int ret;
__be32 info;
ret = __ip_options_compile(net, opt, skb, &info);
if (ret != 0 && skb)
icmp_send(skb, ICMP_PARAMETERPROB, 0, info);
return ret;
}
EXPORT_SYMBOL(ip_options_compile); EXPORT_SYMBOL(ip_options_compile);
/* /*