Attachment 91298 Details for Bug 128605 – file.diff

[patch] file.diff

file.diff (text/plain), 2.13 KB, created by Raffaele De Lorenzo on 2008-11-05 12:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raffaele De Lorenzo

Created: 2008-11-05 12:10:03 UTC

Size: 2.13 KB

patch

obsolete

>--- /usr/src/sbin/dhclient/dhclient.c	2007-02-09 18:50:26.000000000 +0100
>+++ ./dhclient.c	2008-11-04 17:15:04.000000000 +0100
>@@ -629,13 +629,15 @@
> {
> 	struct interface_info *ip = packet->interface;
> 	struct client_lease *lease;
>+	struct in_addr addr;
> 
> 	/* If we're not receptive to an offer right now, or if the offer
> 	   has an unrecognizable transaction id, then just drop it. */
> 	if (packet->interface->client->xid != packet->raw->xid ||
> 	    (packet->interface->hw_address.hlen != packet->raw->hlen) ||
> 	    (memcmp(packet->interface->hw_address.haddr,
>-	    packet->raw->chaddr, packet->raw->hlen)))
>+	    packet->raw->chaddr, packet->raw->hlen))
>+	   )
> 		return;
> 
> 	if (ip->client->state != S_REBOOTING &&
>@@ -654,6 +656,26 @@
> 
> 	ip->client->new = lease;
> 
>+	/* 
>+	 * October 30 2008 - Raffaele De Lorenzo (raffaele.delorenzo@libero.it)
>+	 * Security check - Check if the DHCP server identifier (ip address) match 
>+	 * with localhost (127.0.0.0/8). RFC 2131 required a valid server identifier 
>+	 * ip address.
>+	 *
>+	 */
>+	bzero (&addr, sizeof (struct in_addr));
>+	if (inet_aton (piaddr(packet->client_addr), &addr) != 1){
>+		fprintf (stderr, "ERROR - dhcpack - Server address unreadable\n");
>+		return;
>+	}
>+	/* apply mask at address */
>+	addr.s_addr &= 0x000000FF;
>+	if (addr.s_addr == 0x00007F){
>+		fprintf (stderr, "ERROR - dhcpack - Server ID [%s] not valid (localhost)\n",
>+			 piaddr(packet->client_addr));
>+		return;
>+	}
>+
> 	/* Stop resending DHCPREQUEST. */
> 	cancel_timeout(send_request, ip);
> 
>@@ -838,12 +860,16 @@
> 	    "DHCPOFFER" : "BOOTREPLY";
> 
> 	/* If we're not receptive to an offer right now, or if the offer
>-	   has an unrecognizable transaction id, then just drop it. */
>+	   has an unrecognizable transaction id, then just drop it. 
>+	*/
>+	
>+
> 	if (ip->client->state != S_SELECTING ||
> 	    packet->interface->client->xid != packet->raw->xid ||
> 	    (packet->interface->hw_address.hlen != packet->raw->hlen) ||
> 	    (memcmp(packet->interface->hw_address.haddr,
>-	    packet->raw->chaddr, packet->raw->hlen)))
>+	    packet->raw->chaddr, packet->raw->hlen))
>+	  )
> 		return;
> 
> 	note("%s from %s", name, piaddr(packet->client_addr));

Actions: View | Diff

Attachments on bug 128605: 91298