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

Commit 02ff05c4 authored by David Brownell's avatar David Brownell Committed by David S. Miller
Browse files

net/enc28j60: oops fix 



Prevent oops on enc28j60 packet RX:  make sure buffers are aligned.
Not all architectures support unaligned accesses in kernel space.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarClaudio Lanconelli <lanconelli.claudio@eptar.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8a1d919

drivers/net/enc28j60.c

+2 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) 
		if (RSV_GETBIT(rxstat, RSV_LENCHECKERR))

			ndev->stats.rx_frame_errors++;

	} else {

		skb = dev_alloc_skb(len);

		skb = dev_alloc_skb(len + NET_IP_ALIGN);

		if (!skb) {

			if (netif_msg_rx_err(priv))

				dev_err(&ndev->dev,
@@ -908,6 +908,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) 
			ndev->stats.rx_dropped++;

		} else {

			skb->dev = ndev;

			skb_reserve(skb, NET_IP_ALIGN);

			/* copy the packet from the receive buffer */

			enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv),

					len, skb_put(skb, len));