Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5e76b0a authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent 95743deb

net/packet/af_packet.c

+8 −8
Original line number Diff line number Diff line
@@ -359,6 +359,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.
@@ -407,10 +411,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

	 */
@@ -738,6 +738,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;
@@ -770,10 +774,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

	 */