diff options
author | Matteo Croce <mcroce@redhat.com> | 2020-02-21 12:28:38 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-02-22 21:45:55 -0800 |
commit | 3e72dfdf8227b052393f71d820ec7599909dddc2 (patch) | |
tree | 0ab72704ff95daef958c0eaf82b663dcae45ceb0 /net/ipv4 | |
parent | 42d84c8490f9f0931786f1623191fcab397c3d64 (diff) | |
download | linux-stable-3e72dfdf8227b052393f71d820ec7599909dddc2.tar.gz linux-stable-3e72dfdf8227b052393f71d820ec7599909dddc2.tar.bz2 linux-stable-3e72dfdf8227b052393f71d820ec7599909dddc2.zip |
ipv4: ensure rcu_read_lock() in cipso_v4_error()
Similarly to commit c543cb4a5f07 ("ipv4: ensure rcu_read_lock() in
ipv4_link_failure()"), __ip_options_compile() must be called under rcu
protection.
Fixes: 3da1ed7ac398 ("net: avoid use IPCB in cipso_v4_error")
Suggested-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/cipso_ipv4.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index 376882215919..0bd10a1f477f 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -1724,6 +1724,7 @@ 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; + int res; if (ip_hdr(skb)->protocol == IPPROTO_ICMP || error != -EACCES) return; @@ -1735,7 +1736,11 @@ void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway) 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)) + rcu_read_lock(); + res = __ip_options_compile(dev_net(skb->dev), opt, skb, NULL); + rcu_read_unlock(); + + if (res) return; if (gateway) |