CVS commit: pkgsrc/net/lldpd

["Frank Kardel" <kardel%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kardel
Date:           Sat Mar 28 11:06:18 UTC 2026

Modified Files:
        pkgsrc/net/lldpd: distinfo
        pkgsrc/net/lldpd/patches: patch-src_daemon_interfaces-bsd.c

Log Message:
net/lldpd: avoid memory leaks when returning ealy from bridge scan


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/lldpd/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/lldpd/distinfo
diff -u pkgsrc/net/lldpd/distinfo:1.23 pkgsrc/net/lldpd/distinfo:1.24
--- pkgsrc/net/lldpd/distinfo:1.23      Sat Mar 28 10:43:49 2026
+++ pkgsrc/net/lldpd/distinfo   Sat Mar 28 11:06:18 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2026/03/28 10:43:49 kardel Exp $
+$NetBSD: distinfo,v 1.24 2026/03/28 11:06:18 kardel Exp $
 
 BLAKE2s (lldpd-1.0.21.tar.gz) = 48ad72069b1cc6c4f552d5b89a962b7ab2360943d6ef9b0c39beae4368f88610
 SHA512 (lldpd-1.0.21.tar.gz) = 047dc23a9679e4f6f6a0acbccc1463264b4b099533acad396bc37d5dd058b8f5f197e544b56d3d893b231f5f205186663a367873e1059bf613adaa04658d6036
 Size (lldpd-1.0.21.tar.gz) = 2037252 bytes
-SHA1 (patch-src_daemon_interfaces-bsd.c) = 7e977aab5ef2adf3cc6ae9a6877adf8941b8bd7d
+SHA1 (patch-src_daemon_interfaces-bsd.c) = 47630cf4a9d8343f473de12c710f981b43399ff9

Index: pkgsrc/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c
diff -u pkgsrc/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c:1.5 pkgsrc/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c:1.6
--- pkgsrc/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c:1.5      Sat Mar 28 10:43:49 2026
+++ pkgsrc/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c  Sat Mar 28 11:06:18 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_daemon_interfaces-bsd.c,v 1.5 2026/03/28 10:43:49 kardel Exp $
+$NetBSD: patch-src_daemon_interfaces-bsd.c,v 1.6 2026/03/28 11:06:18 kardel Exp $
 
 SIOCGDRVSPEC needs struct ifdrv to query the bridge interfaces
 fixes tight loop when scanning bridge interfaces
 
---- src/daemon/interfaces-bsd.c.orig   2026-01-14 16:36:43.188211608 +0000
+--- src/daemon/interfaces-bsd.c.orig   2025-08-30 18:02:39.000000000 +0000
 +++ src/daemon/interfaces-bsd.c
-@@ -86,15 +86,18 @@ retry_alloc:
+@@ -86,19 +86,24 @@ retry_alloc:
  
  #if defined HOST_OS_FREEBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX || \
      defined HOST_OS_DRAGONFLY
@@ -20,6 +20,7 @@ fixes tight loop when scanning bridge in
        strlcpy(ifd.ifd_name, master->name, sizeof(ifd.ifd_name));
        if (ioctl(cfg->g_sock, SIOCGDRVSPEC, (caddr_t)&ifd) < 0) {
                log_debug("interfaces", "%s is not a bridge", master->name);
++              free(req);
                return;
        }
 +      bifc.ifbic_len = ifd.ifd_len;
@@ -27,7 +28,12 @@ fixes tight loop when scanning bridge in
  #elif defined HOST_OS_OPENBSD
        strlcpy(bifc.ifbic_name, master->name, sizeof(bifc.ifbic_name));
        if (ioctl(cfg->g_sock, SIOCBRDGIFS, (caddr_t)&bifc) < 0) {
-@@ -121,6 +124,7 @@ retry_alloc:
+               log_debug("interfaces", "%s is not a bridge", master->name);
++              free(bifc.ifbic_req);
+               return;
+       }
+ #else
+@@ -121,6 +126,7 @@ retry_alloc:
                    master->name);
                slave->upper = master;
        }