diff options
| author | Hangbin Liu <liuhangbin@gmail.com> | 2022-04-14 16:49:25 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-15 11:17:30 +0100 |
| commit | 29e8e659f984be00d75ec5fef4e37c88def72712 (patch) | |
| tree | 29c8f1c036c34ca5a70aaa81da326d4a6317d0fc /net/packet | |
| parent | 1a74e99323746353bba11562a2f2d0aa8102f402 (diff) | |
| download | linux-29e8e659f984be00d75ec5fef4e37c88def72712.tar.gz linux-29e8e659f984be00d75ec5fef4e37c88def72712.tar.bz2 linux-29e8e659f984be00d75ec5fef4e37c88def72712.zip | |
net/packet: fix packet_sock xmit return value checking
packet_sock xmit could be dev_queue_xmit, which also returns negative
errors. So only checking positive errors is not enough, or userspace
sendmsg may return success while packet is not send out.
Move the net_xmit_errno() assignment in the braces as checkpatch.pl said
do not use assignment in if condition.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index c39c09899fd0..002d2b9c69dd 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2858,8 +2858,9 @@ tpacket_error: status = TP_STATUS_SEND_REQUEST; err = po->xmit(skb); - if (unlikely(err > 0)) { - err = net_xmit_errno(err); + if (unlikely(err != 0)) { + if (err > 0) + err = net_xmit_errno(err); if (err && __packet_get_status(po, ph) == TP_STATUS_AVAILABLE) { /* skb was destructed already */ @@ -3060,8 +3061,12 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) skb->no_fcs = 1; err = po->xmit(skb); - if (err > 0 && (err = net_xmit_errno(err)) != 0) - goto out_unlock; + if (unlikely(err != 0)) { + if (err > 0) + err = net_xmit_errno(err); + if (err) + goto out_unlock; + } dev_put(dev); |