diff options
| author | jpaetzel <jpaetzel@FreeBSD.org> | 2009-07-22 08:11:48 +0800 |
|---|---|---|
| committer | jpaetzel <jpaetzel@FreeBSD.org> | 2009-07-22 08:11:48 +0800 |
| commit | eacfdd4c7fc43f4682e960e46e6365a585ba86c7 (patch) | |
| tree | 05d670d6fb76f3fbd2d75bd47e7b3794f57be143 /net | |
| parent | 86ed9a34efff7599d6bfb3844a25111cce9720f9 (diff) | |
| download | freebsd-ports-gnome-eacfdd4c7fc43f4682e960e46e6365a585ba86c7.tar.gz freebsd-ports-gnome-eacfdd4c7fc43f4682e960e46e6365a585ba86c7.tar.zst freebsd-ports-gnome-eacfdd4c7fc43f4682e960e46e6365a585ba86c7.zip | |
Fix security advsory with patches from Ubuntu project.
http://vuxml.FreeBSD.org/c444c8b7-7169-11de-9ab7-000c29a67389.html
PR: ports/136891
Submitted by: wxs@
Reviewed by: simon@
Approved by: itetcu@ (mentor)
Diffstat (limited to 'net')
| -rw-r--r-- | net/isc-dhcp30-server/Makefile | 2 | ||||
| -rw-r--r-- | net/isc-dhcp30-server/files/patch-client::dhclient.c | 24 |
2 files changed, 19 insertions, 7 deletions
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile index 0bebc7f6ec51..75e7879fd55a 100644 --- a/net/isc-dhcp30-server/Makefile +++ b/net/isc-dhcp30-server/Makefile @@ -20,7 +20,7 @@ MAINTAINER= jpaetzel@FreeBSD.org COMMENT?= The ISC Dynamic Host Configuration Protocol server PORTREVISION_SERVER= 5 -PORTREVISION_CLIENT= 0 +PORTREVISION_CLIENT= 1 PORTREVISION_RELAY= 0 PORTREVISION_DEVEL= 0 diff --git a/net/isc-dhcp30-server/files/patch-client::dhclient.c b/net/isc-dhcp30-server/files/patch-client::dhclient.c index 628906384c78..00fc65146a4e 100644 --- a/net/isc-dhcp30-server/files/patch-client::dhclient.c +++ b/net/isc-dhcp30-server/files/patch-client::dhclient.c @@ -1,5 +1,5 @@ ---- client/dhclient.c.orig 2008-01-22 17:28:23.000000000 +0000 -+++ client/dhclient.c 2008-05-26 08:17:53.000000000 +0000 +--- client/dhclient.c.orig 2008-01-22 12:28:23.000000000 -0500 ++++ client/dhclient.c 2009-07-15 15:02:28.000000000 -0400 @@ -38,6 +38,13 @@ #include "dhcpd.h" #include "version.h" @@ -242,7 +242,19 @@ add_timeout (cur_time + client -> interval, send_request, client, 0, 0); } -@@ -2624,6 +2734,13 @@ +@@ -2509,8 +2619,9 @@ + (struct option_state *)0, + lease -> options, + &global_scope, oc, MDL)) { +- if (data.len > 3) { +- struct iaddr netmask, subnet, broadcast; ++ struct iaddr netmask; ++ if (data.len > 3 && data.len <= sizeof(netmask.iabuf)) { ++ struct iaddr subnet, broadcast; + + memcpy (netmask.iabuf, data.data, data.len); + netmask.len = data.len; +@@ -2624,6 +2735,13 @@ */ if (leaseFile != NULL) fclose(leaseFile); @@ -256,7 +268,7 @@ execve (scriptName, argv, envp); log_error ("execve (%s, ...): %m", scriptName); exit (0); -@@ -2810,8 +2927,10 @@ +@@ -2810,8 +2928,10 @@ case S_STOPPED: break; } @@ -267,7 +279,7 @@ } } } -@@ -3039,7 +3158,9 @@ +@@ -3039,7 +3159,9 @@ break; case server_awaken: @@ -277,7 +289,7 @@ break; } } -@@ -3177,3 +3298,265 @@ +@@ -3177,3 +3299,265 @@ data_string_forget (&ddns_dhcid, MDL); return rcode; } |