Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

odhcpd: avoid illegal memory access in some corner cases

Browse source 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 45428
This commit is contained in:
Steven Barth 2015-04-14 08:31:53 +00:00
parent c99c9f875e
commit 7e5bf40cac
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
package/network/ipv6/odhcp6c/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2012-2014 OpenWrt.org # Copyright (C) 2012-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,24 +8,20 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
PKG_VERSION:=2015-04-10 PKG_VERSION:=2015-04-13
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/sbyx/odhcp6c.git PKG_SOURCE_URL:=https://github.com/sbyx/odhcp6c.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=c3bbeced0f204b6b9571148ae84227105baaf179 PKG_SOURCE_VERSION:=19c64c524614ea7fdbcedcc50d6980f096ccadb9
PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_prefix_class),0)
CMAKE_OPTIONS += -DEXT_PREFIX_CLASS=$(CONFIG_PACKAGE_odhcp6c_ext_prefix_class)
endif
ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_cer_id),0) ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_cer_id),0)
CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcp6c_ext_cer_id) CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcp6c_ext_cer_id)
endif endif
@ -38,11 +34,6 @@ define Package/odhcp6c
endef endef
define Package/odhcp6c/config define Package/odhcp6c/config
config PACKAGE_odhcp6c_ext_prefix_class
int "Prefix Class Extension ID (0 = disabled)"
depends on PACKAGE_odhcp6c
default 0
config PACKAGE_odhcp6c_ext_cer_id config PACKAGE_odhcp6c_ext_cer_id
int "CER-ID Extension ID (0 = disabled)" int "CER-ID Extension ID (0 = disabled)"
depends on PACKAGE_odhcp6c depends on PACKAGE_odhcp6c

8
package/network/ipv6/odhcp6c/files/dhcpv6.script
View file

@ -20,6 +20,14 @@ setup_interface () {
proto_add_dns_server "$dns" proto_add_dns_server "$dns"
done done
for radomain in $RA_DOMAINS; do
local duplicate=0
for domain in $DOMAINS; do
[ "$radomain" = "$domain" ] && duplicate=1
done
[ "$duplicate" = 0 ] && DOMAINS="$DOMAINS $radomain"
done
for domain in $DOMAINS; do for domain in $DOMAINS; do
proto_add_dns_search "$domain" proto_add_dns_search "$domain"
done done

4
package/network/services/odhcpd/Makefile
View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcpd PKG_NAME:=odhcpd
PKG_VERSION:=2015-04-10 PKG_VERSION:=2015-04-13
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://github.com/sbyx/odhcpd.git PKG_SOURCE_URL:=git://github.com/sbyx/odhcpd.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=e23972527f93a3d2a5412400384519ff550708b7 PKG_SOURCE_VERSION:=a06dd6481cd046e4856774ac32cdc11f4bc721e2
PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0