diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-02 13:01:28 -0800 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2007-02-05 08:31:45 -0800 |
| commit | 2a5332990f1f6f76a03396db7fb894bcd55c4ffe (patch) | |
| tree | 1a44f70bb7675ae4b792e5a0fc70c5007c4a3594 | |
| parent | 6d2d108d66d02bc617e3cab2419fecf0e43afae6 (diff) | |
| download | kernel-adaptation-pc-2a5332990f1f6f76a03396db7fb894bcd55c4ffe.tar.gz kernel-adaptation-pc-2a5332990f1f6f76a03396db7fb894bcd55c4ffe.tar.bz2 kernel-adaptation-pc-2a5332990f1f6f76a03396db7fb894bcd55c4ffe.zip | |
[PATCH] AF_PACKET: Check device down state before hard header callbacks.
If the device is down, invoking the device hard header callbacks
is not legal, so check it early.
Based upon a shaper OOPS report from Frederik Deweerdt.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | net/packet/af_packet.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index b3728141d67..dec2ce6e308 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -358,6 +358,10 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock, if (dev == NULL) goto out_unlock; + err = -ENETDOWN; + if (!(dev->flags & IFF_UP)) + goto out_unlock; + /* * You may not queue a frame bigger than the mtu. This is the lowest level * raw protocol and you must do your own fragmentation at this level. @@ -406,10 +410,6 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock, if (err) goto out_free; - err = -ENETDOWN; - if (!(dev->flags & IFF_UP)) - goto out_free; - /* * Now send it */ @@ -737,6 +737,10 @@ static int packet_sendmsg(struct kiocb *iocb, struct socket *sock, if (sock->type == SOCK_RAW) reserve = dev->hard_header_len; + err = -ENETDOWN; + if (!(dev->flags & IFF_UP)) + goto out_unlock; + err = -EMSGSIZE; if (len > dev->mtu+reserve) goto out_unlock; @@ -769,10 +773,6 @@ static int packet_sendmsg(struct kiocb *iocb, struct socket *sock, skb->dev = dev; skb->priority = sk->sk_priority; - err = -ENETDOWN; - if (!(dev->flags & IFF_UP)) - goto out_free; - /* * Now send it */ |