summaryrefslogtreecommitdiff
path: root/net/ipv4/ip_output.c
diff options
context:
space:
mode:
authorYajun Deng <yajun.deng@linux.dev>2021-08-30 17:16:40 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-01 17:25:46 +0100
commit9b4444197252bec2f3248b3e4fff11a5d571c19e (patch)
tree1519b55093a7fde982a88a074ff43fe55a6344d0 /net/ipv4/ip_output.c
parent2f56c4845df93c509ea3a63588fd4251ef5c5c87 (diff)
net: ipv4: Fix the warning for dereference
[ Upstream commit 1b9fbe813016b08e08b22ddba4ddbf9cb1b04b00 ] Add a if statements to avoid the warning. Dan Carpenter report: The patch faf482ca196a: "net: ipv4: Move ip_options_fragment() out of loop" from Aug 23, 2021, leads to the following Smatch complaint: net/ipv4/ip_output.c:833 ip_do_fragment() warn: variable dereferenced before check 'iter.frag' (see line 828) Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: faf482ca196a ("net: ipv4: Move ip_options_fragment() out of loop") Link: https://lore.kernel.org/netdev/20210830073802.GR7722@kadam/T/#t Signed-off-by: Yajun Deng <yajun.deng@linux.dev> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r--net/ipv4/ip_output.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index fb91a466b2d3..e77afaecc981 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -833,7 +833,9 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
/* Everything is OK. Generate! */
ip_fraglist_init(skb, iph, hlen, &iter);
- ip_options_fragment(iter.frag);
+
+ if (iter.frag)
+ ip_options_fragment(iter.frag);
for (;;) {
/* Prepare header of the next frame,