Commit 29e8e659 authored by Hangbin Liu's avatar Hangbin Liu Committed by David S. Miller

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: 1da177e4 ("Linux-2.6.12-rc2")
Reported-by: default avatarFlavio Leitner <fbl@redhat.com>
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a74e993
...@@ -2858,8 +2858,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) ...@@ -2858,8 +2858,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
status = TP_STATUS_SEND_REQUEST; status = TP_STATUS_SEND_REQUEST;
err = po->xmit(skb); err = po->xmit(skb);
if (unlikely(err > 0)) { if (unlikely(err != 0)) {
err = net_xmit_errno(err); if (err > 0)
err = net_xmit_errno(err);
if (err && __packet_get_status(po, ph) == if (err && __packet_get_status(po, ph) ==
TP_STATUS_AVAILABLE) { TP_STATUS_AVAILABLE) {
/* skb was destructed already */ /* skb was destructed already */
...@@ -3060,8 +3061,12 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) ...@@ -3060,8 +3061,12 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
skb->no_fcs = 1; skb->no_fcs = 1;
err = po->xmit(skb); err = po->xmit(skb);
if (err > 0 && (err = net_xmit_errno(err)) != 0) if (unlikely(err != 0)) {
goto out_unlock; if (err > 0)
err = net_xmit_errno(err);
if (err)
goto out_unlock;
}
dev_put(dev); dev_put(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment