mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
[PATCH] e1000: fix for dhcp issue
Parse outgoing packets in e1000_transfer_dhcp_info as raw packet even if protocol bits are set. pump, for instance causes kernel panic on some systems, if parsed via udp header. Thanks to Derrell Lipman <Derrell.Lipman@BacklotTech.com> for reporting and testing. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
d5366d9e24
commit
a174fd88d2
1 changed files with 1 additions and 13 deletions
|
@ -2621,19 +2621,7 @@ e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb)
|
|||
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) )
|
||||
return 0;
|
||||
}
|
||||
if(htons(ETH_P_IP) == skb->protocol) {
|
||||
const struct iphdr *ip = skb->nh.iph;
|
||||
if(IPPROTO_UDP == ip->protocol) {
|
||||
struct udphdr *udp = (struct udphdr *)(skb->h.uh);
|
||||
if(ntohs(udp->dest) == 67) {
|
||||
offset = (uint8_t *)udp + 8 - skb->data;
|
||||
length = skb->len - offset;
|
||||
|
||||
return e1000_mng_write_dhcp_info(hw,
|
||||
(uint8_t *)udp + 8, length);
|
||||
}
|
||||
}
|
||||
} else if((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) {
|
||||
if ((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) {
|
||||
struct ethhdr *eth = (struct ethhdr *) skb->data;
|
||||
if((htons(ETH_P_IP) == eth->h_proto)) {
|
||||
const struct iphdr *ip =
|
||||
|
|
Loading…
Reference in a new issue