ipconfig: handle case of delayed DHCP server
Subsystems (3)
PATCH 1/1 ipconfig: handle case of delayed DHCP server
If a DHCP server is delayed, it's possible for the client to receive the DHCPOFFER after it has already sent out a new DHCPDISCOVER message from a second interface. The client then sends out a DHCPREQUEST from the second interface, but the server doesn't recognize the device and rejects the request.
This patch simply tracks the current device being configured and throws away the OFFER if it is not intended for the current device. A more sophisticated approach would be to put the OFFER information into the struct ic_device rather than storing it globally.
net/ipv4/ipconfig.c +0 -0
@@ -139,6 +139,8 @@ __be32 ic_servaddr = NONE; /* Boot server IP address */
__be32 root_server_addr = NONE; /* Address of NFS server */
u8 root_server_path[256] = { 0, }; /* Path to mount as root */
+u32 ic_dev_xid; /* Device under configuration */
+
/* vendor class identifier */
static char vendor_class_identifier[253] __initdata;
@@ -932,6 +934,13 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
goto drop_unlock; }
+ /* Is it a reply for the device we are configuring? */
+ if (b->xid != ic_dev_xid) {
+ if (net_ratelimit())
+ printk(KERN_ERR "DHCP/BOOTP: Ignoring delayed packet \n");
+ goto drop_unlock;
+ }
+
/* Parse extensions */
if (ext_len >= 4 &&
!memcmp(b->exten, ic_bootp_cookie, 4)) { /* Check magic cookie */
@@ -1115,6 +1124,9 @@ static int __init ic_dynamic(void)
get_random_bytes(&timeout, sizeof(timeout));
timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned) CONF_TIMEOUT_RANDOM);
for (;;) {
+ /* Track the device we are configuring */
+ ic_dev_xid = d->xid;
+
#ifdef IPCONFIG_BOOTP
if (do_bootp && (d->able & IC_BOOTP))
ic_bootp_send_if(d, jiffies - start_jiffies);David Miller
maintainerFrom: "Chris Friesen" <[email protected]>
Date: Fri, 08 May 2009 14:56:11 -0600
Review
Quoted 6 lines
(quoted diff) +5
-0+ /* Is it a reply for the device we are configuring? */ + if (b->xid != ic_dev_xid) { + if (net_ratelimit()) + printk(KERN_ERR "DHCP/BOOTP: Ignoring delayed packet \n"); + goto drop_unlock;
Please don't use such odd indentation for this printk statement.
Quoted 4 lines · David Miller
From: "Chris Friesen" <[email protected]>
Date: Fri, 08 May 2009 14:56:11 -0600Quoted 1 line
Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ /* Is it a reply for the device we are configuring? */ + if (b->xid != ic_dev_xid) { + if (net_ratelimit()) + printk(KERN_ERR "DHCP/BOOTP: Ignoring delayed packet \n"); + goto drop_unlock;Please don't use such odd indentation for this printk statement.
Weird it looked ok in my mailer 3 tabs in, and out to coloumn 82. Dave someting word wrap it for you?
Eric
David Miller
maintainerFrom: [email protected] (Eric W. Biederman)
Date: Sun, 10 May 2009 00:53:03 -0700
Quoted 15 lines
Quoted 4 lines · David Miller
From: "Chris Friesen" <[email protected]>
Date: Fri, 08 May 2009 14:56:11 -0600Quoted 1 line
Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ /* Is it a reply for the device we are configuring? */ + if (b->xid != ic_dev_xid) { + if (net_ratelimit()) + printk(KERN_ERR "DHCP/BOOTP: Ignoring delayed packet \n"); + goto drop_unlock;Please don't use such odd indentation for this printk statement.
Quoted 2 lines
Weird it looked ok in my mailer 3 tabs in, and out to coloumn 82. Dave someting word wrap it for you?
I hope it's not my arch-nemesis, format=flowed :-/
Quoted 15 lines · David Miller
From: [email protected] (Eric W. Biederman)
Date: Sun, 10 May 2009 00:53:03 -0700Quoted 12 lines
Quoted 10 lines · David Miller
From: "Chris Friesen" <[email protected]>
Date: Fri, 08 May 2009 14:56:11 -0600Review
Quoted 5 lines
(quoted diff) +5
-0+ /* Is it a reply for the device we are configuring? */ + if (b->xid != ic_dev_xid) { + if (net_ratelimit()) + printk(KERN_ERR "DHCP/BOOTP: Ignoring delayed packet \n"); + goto drop_unlock;Please don't use such odd indentation for this printk statement.
Quoted 4 lines
Quoted 2 lines
Weird it looked ok in my mailer 3 tabs in, and out to coloumn 82. Dave someting word wrap it for you?
I hope it's not my arch-nemesis, format=flowed :-/
Yeah, that's what it was. The underlying text wasn't actually wrapped though, so it was probably your MTA that was doing the wrapping.
Here's a resend with flowed disabled.
Chris
If a DHCP server is delayed, it's possible for the client to receive the DHCPOFFER after it has already sent out a new DHCPDISCOVER message from a second interface. The client then sends out a DHCPREQUEST from the second interface, but the server doesn't recognize the device and rejects the request.
This patch simply tracks the current device being configured and throws away the OFFER if it is not intended for the current device. A more sophisticated approach would be to put the OFFER information into the struct ic_device rather than storing it globally.
net/ipv4/ipconfig.c +12 -0
@@ -139,6 +139,8 @@ __be32 ic_servaddr = NONE; /* Boot server IP address */__be32 root_server_addr =NONE ;/* Address of NFS server */ u8 root_server_path[256 ] = {0 , };/* Path to mount as root */ +u32 ic_dev_xid;/* Device under configuration */ +/* vendor class identifier */ static char vendor_class_identifier[253 ]__initdata ;
@@ -932,6 +934,13 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str goto drop_unlock; } +/* Is it a reply for the device we are configuring? */ +if (b->xid != ic_dev_xid) { +if (net_ratelimit ()) +printk (KERN_ERR "DHCP/BOOTP: Ignoring delayed packet \n" ); + goto drop_unlock; + } +/* Parse extensions */ if (ext_len >=4 && !memcmp (b->exten, ic_bootp_cookie,4 )) {/* Check magic cookie */
@@ -1115,6 +1124,9 @@ static int __init ic_dynamic(void)get_random_bytes (&timeout,sizeof (timeout)); timeout =CONF_BASE_TIMEOUT + (timeout % (unsigned )CONF_TIMEOUT_RANDOM );for (;;) { +/* Track the device we are configuring */ + ic_dev_xid = d->xid; +#ifdef IPCONFIG_BOOTP if (do_bootp && (d->able &IC_BOOTP ))ic_bootp_send_if (d, jiffies - start_jiffies);
From: "Chris Friesen" <[email protected]>
Date: Mon, 11 May 2009 11:44:45 -0600
Quoted 6 lines
If a DHCP server is delayed, it's possible for the client to receive the DHCPOFFER after it has already sent out a new DHCPDISCOVER message from a second interface. The client then sends out a DHCPREQUEST from the second interface, but the server doesn't recognize the device and rejects the request.
Quoted 6 lines
This patch simply tracks the current device being configured and throws away the OFFER if it is not intended for the current device. A more sophisticated approach would be to put the OFFER information into the struct
ic_devicerather than storing it globally.Signed-off-by Chris Friesen <[email protected]>
Applied, thanks Chris.