Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd/dist Import dhcpcd-7.2.3 with the follow...



details:   https://anonhg.NetBSD.org/src/rev/caa8f275fc55
branches:  trunk
changeset: 452306:caa8f275fc55
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Jun 26 17:46:08 2019 +0000

description:
Import dhcpcd-7.2.3 with the following changes:
  *  BSD: Check RTM lengths incase of kernel issues
  *  DHCP6: Don't stop even when last router goes away
  *  DHCP6: Fix inform from RA
  *  hostname: Fix short hostname check

diffstat:

 external/bsd/dhcpcd/dist/configure    |  2 +-
 external/bsd/dhcpcd/dist/src/defs.h   |  2 +-
 external/bsd/dhcpcd/dist/src/dhcp6.h  |  1 -
 external/bsd/dhcpcd/dist/src/if-sun.c |  4 +++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 230deb335460 -r caa8f275fc55 external/bsd/dhcpcd/dist/configure
--- a/external/bsd/dhcpcd/dist/configure        Wed Jun 26 15:31:17 2019 +0000
+++ b/external/bsd/dhcpcd/dist/configure        Wed Jun 26 17:46:08 2019 +0000
@@ -1368,7 +1368,7 @@
 elif [ "$DEV" != no -a "$UDEV" != no ]; then
        echo "no"
        if [ -n "$UDEV" ]; then
-               echo "udev has been explicity requested ... aborting" >&2
+               echo "udev has been explicitly requested ... aborting" >&2
                exit 1
        fi
 fi
diff -r 230deb335460 -r caa8f275fc55 external/bsd/dhcpcd/dist/src/defs.h
--- a/external/bsd/dhcpcd/dist/src/defs.h       Wed Jun 26 15:31:17 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/defs.h       Wed Jun 26 17:46:08 2019 +0000
@@ -28,7 +28,7 @@
 #define CONFIG_H
 
 #define PACKAGE                        "dhcpcd"
-#define VERSION                        "7.2.2"
+#define VERSION                        "7.2.3"
 
 #ifndef CONFIG
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
diff -r 230deb335460 -r caa8f275fc55 external/bsd/dhcpcd/dist/src/dhcp6.h
--- a/external/bsd/dhcpcd/dist/src/dhcp6.h      Wed Jun 26 15:31:17 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp6.h      Wed Jun 26 17:46:08 2019 +0000
@@ -235,7 +235,6 @@
 int dhcp6_dadcompleted(const struct interface *);
 void dhcp6_abort(struct interface *);
 void dhcp6_drop(struct interface *, const char *);
-void dhcp6_dropnondelegates(struct interface *ifp);
 int dhcp6_dump(struct interface *);
 #endif /* DHCP6 */
 
diff -r 230deb335460 -r caa8f275fc55 external/bsd/dhcpcd/dist/src/if-sun.c
--- a/external/bsd/dhcpcd/dist/src/if-sun.c     Wed Jun 26 15:31:17 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/if-sun.c     Wed Jun 26 17:46:08 2019 +0000
@@ -1078,7 +1078,9 @@
                return -1;
        if (len == 0)
                return 0;
-       if (len < rtm.hdr.rtm_msglen) {
+       if ((size_t)len < offsetof(struct rt_msghdr, rtm_index) ||
+           len < rtm.hdr.rtm_msglen)
+       {
                errno = EINVAL;
                return -1;
        }



Home | Main Index | Thread Index | Old Index