summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-19 01:44:16 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-19 01:44:16 +0000
commit9eafd1cb17da2076804266cfcc8f9f6b54694352 (patch)
tree5f91f2b44e686961c914dd0c1e3f88b956c7ec49 /package/busybox/patches
parent915f8c95ae7943cb3a81715331f5df87e808c943 (diff)
fix oversized packets in udhcpc (closes: #962), bump busybox release number in whiterussian
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5583 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches')
-rw-r--r--package/busybox/patches/241-udhcpc-oversized_packets.patch85
1 files changed, 85 insertions, 0 deletions
diff --git a/package/busybox/patches/241-udhcpc-oversized_packets.patch b/package/busybox/patches/241-udhcpc-oversized_packets.patch
new file mode 100644
index 000000000..d041bf5c3
--- /dev/null
+++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch
@@ -0,0 +1,85 @@
+diff -ruN busybox-1.2.1-old/networking/udhcp/packet.c busybox-1.2.1-new/networking/udhcp/packet.c
+--- busybox-1.2.1-old/networking/udhcp/packet.c 2006-07-01 00:42:02.000000000 +0200
++++ busybox-1.2.1-new/networking/udhcp/packet.c 2006-11-19 01:04:40.000000000 +0100
+@@ -111,6 +111,10 @@
+ return ~sum;
+ }
+
++int udhcp_get_payload_len(struct dhcpMessage *payload)
++{
++ return sizeof(struct dhcpMessage) - MAX_OPTIONS_LEN + end_option(payload->options) + sizeof(payload->options[0]);
++}
+
+ /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */
+ int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port,
+@@ -120,6 +124,7 @@
+ int result;
+ struct sockaddr_ll dest;
+ struct udp_dhcp_packet packet;
++ int p_len = udhcp_get_payload_len(payload);
+
+ if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
+ DEBUG(LOG_ERR, "socket call failed: %m");
+@@ -128,6 +133,7 @@
+
+ memset(&dest, 0, sizeof(dest));
+ memset(&packet, 0, sizeof(packet));
++ memcpy(&(packet.data), payload, p_len);
+
+ dest.sll_family = AF_PACKET;
+ dest.sll_protocol = htons(ETH_P_IP);
+@@ -145,18 +151,19 @@
+ packet.ip.daddr = dest_ip;
+ packet.udp.source = htons(source_port);
+ packet.udp.dest = htons(dest_port);
+- packet.udp.len = htons(sizeof(packet.udp) + sizeof(struct dhcpMessage)); /* cheat on the psuedo-header */
++ p_len += sizeof(packet.udp);
++ packet.udp.len = htons(p_len);
+ packet.ip.tot_len = packet.udp.len;
+- memcpy(&(packet.data), payload, sizeof(struct dhcpMessage));
+- packet.udp.check = udhcp_checksum(&packet, sizeof(struct udp_dhcp_packet));
++ p_len += sizeof(packet.ip);
++ packet.udp.check = udhcp_checksum(&packet, p_len);
+
+- packet.ip.tot_len = htons(sizeof(struct udp_dhcp_packet));
++ packet.ip.tot_len = htons(p_len);
+ packet.ip.ihl = sizeof(packet.ip) >> 2;
+ packet.ip.version = IPVERSION;
+ packet.ip.ttl = IPDEFTTL;
+ packet.ip.check = udhcp_checksum(&(packet.ip), sizeof(packet.ip));
+
+- result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest));
++ result = sendto(fd, &packet, p_len, 0, (struct sockaddr *) &dest, sizeof(dest));
+ if (result <= 0) {
+ DEBUG(LOG_ERR, "write on socket failed: %m");
+ }
+@@ -201,7 +208,7 @@
+ return -1;
+ }
+
+- result = write(fd, payload, sizeof(struct dhcpMessage));
++ result = write(fd, payload, udhcp_get_payload_len(payload));
+ close(fd);
+ return result;
+ }
+diff -ruN busybox-1.2.1-old/networking/udhcp/packet.h busybox-1.2.1-new/networking/udhcp/packet.h
+--- busybox-1.2.1-old/networking/udhcp/packet.h 2006-07-01 00:42:02.000000000 +0200
++++ busybox-1.2.1-new/networking/udhcp/packet.h 2006-11-19 00:49:38.000000000 +0100
+@@ -4,6 +4,8 @@
+ #include <netinet/udp.h>
+ #include <netinet/ip.h>
+
++#define MAX_OPTIONS_LEN 308
++
+ struct dhcpMessage {
+ uint8_t op;
+ uint8_t htype;
+@@ -20,7 +22,7 @@
+ uint8_t sname[64];
+ uint8_t file[128];
+ uint32_t cookie;
+- uint8_t options[308]; /* 312 - cookie */
++ uint8_t options[MAX_OPTIONS_LEN]; /* 312 - cookie */
+ };
+
+ struct udp_dhcp_packet {