| Message ID | 20200824111504.22272-1-linmiaohe@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: Avoid access icmp_err_convert when icmp code is ICMP_FRAG_NEEDED | expand |
From: Miaohe Lin <linmiaohe@huawei.com> Date: Mon, 24 Aug 2020 07:15:04 -0400 > There is no need to fetch errno and fatal info from icmp_err_convert when > icmp code is ICMP_FRAG_NEEDED. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Applied to net-next, thanks.
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 6fd4330287c2..ea4c36e93824 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -260,11 +260,12 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info) err = EHOSTUNREACH; if (code > NR_ICMP_UNREACH) break; - err = icmp_err_convert[code].errno; - harderr = icmp_err_convert[code].fatal; if (code == ICMP_FRAG_NEEDED) { harderr = inet->pmtudisc != IP_PMTUDISC_DONT; err = EMSGSIZE; + } else { + err = icmp_err_convert[code].errno; + harderr = icmp_err_convert[code].fatal; } }
There is no need to fetch errno and fatal info from icmp_err_convert when icmp code is ICMP_FRAG_NEEDED. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- net/ipv4/raw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)