Commit 9dc829a1 authored by Xie He's avatar Xie He Committed by David S. Miller

drivers/net/wan/lapbether: Fixed the value of hard_header_len

When this driver transmits data,
  first this driver will remove a pseudo header of 1 byte,
  then the lapb module will prepend the LAPB header of 2 or 3 bytes,
  then this driver will prepend a length field of 2 bytes,
  then the underlying Ethernet device will prepend its own header.

So, the header length required should be:
  -1 + 3 + 2 + "the header length needed by the underlying device".

This patch fixes kernel panic when this driver is used with AF_PACKET
SOCK_DGRAM sockets.
Signed-off-by: default avatarXie He <xie.he.0141@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f57a1e5
...@@ -303,7 +303,6 @@ static void lapbeth_setup(struct net_device *dev) ...@@ -303,7 +303,6 @@ static void lapbeth_setup(struct net_device *dev)
dev->netdev_ops = &lapbeth_netdev_ops; dev->netdev_ops = &lapbeth_netdev_ops;
dev->needs_free_netdev = true; dev->needs_free_netdev = true;
dev->type = ARPHRD_X25; dev->type = ARPHRD_X25;
dev->hard_header_len = 3;
dev->mtu = 1000; dev->mtu = 1000;
dev->addr_len = 0; dev->addr_len = 0;
} }
...@@ -324,6 +323,14 @@ static int lapbeth_new_device(struct net_device *dev) ...@@ -324,6 +323,14 @@ static int lapbeth_new_device(struct net_device *dev)
if (!ndev) if (!ndev)
goto out; goto out;
/* When transmitting data:
* first this driver removes a pseudo header of 1 byte,
* then the lapb module prepends an LAPB header of at most 3 bytes,
* then this driver prepends a length field of 2 bytes,
* then the underlying Ethernet device prepends its own header.
*/
ndev->hard_header_len = -1 + 3 + 2 + dev->hard_header_len;
lapbeth = netdev_priv(ndev); lapbeth = netdev_priv(ndev);
lapbeth->axdev = ndev; lapbeth->axdev = ndev;
......
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