diff options
| author | YueHaibing <[email protected]> | 2020-05-28 14:34:07 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2020-06-01 22:33:24 +0000 |
| commit | 4c21daae3dbc9f8536cc18e6e53627821fa2c90c (patch) | |
| tree | 6fe27ee7cb67f7f769a420f7aa329bd1dd24d004 | |
| parent | net: dsa: sja1105: suppress -Wmissing-prototypes in sja1105_vl.c (diff) | |
| download | kernel-4c21daae3dbc9f8536cc18e6e53627821fa2c90c.tar.gz kernel-4c21daae3dbc9f8536cc18e6e53627821fa2c90c.zip | |
tipc: Fix NULL pointer dereference in __tipc_sendstream()
tipc_sendstream() may send zero length packet, then tipc_msg_append()
do not alloc skb, skb_peek_tail() will get NULL, msg_set_ack_required
will trigger NULL pointer dereference.
Reported-by: [email protected]
Fixes: 0a3e060f340d ("tipc: add test for Nagle algorithm effectiveness")
Signed-off-by: YueHaibing <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | net/tipc/socket.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 3734cdbedc9c..26123f4177fd 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1588,8 +1588,12 @@ static int __tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dlen) tsk->pkt_cnt += skb_queue_len(txq); } else { skb = skb_peek_tail(txq); - msg_set_ack_required(buf_msg(skb)); - tsk->expect_ack = true; + if (skb) { + msg_set_ack_required(buf_msg(skb)); + tsk->expect_ack = true; + } else { + tsk->expect_ack = false; + } tsk->msg_acc = 0; tsk->pkt_cnt = 0; } |