From nobody Fri Nov 13 02:38:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jQhJC1TCFz6y7mv for ; Fri, 13 Nov 2026 02:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQhJB3Lpyz4vLC for ; Fri, 13 Nov 2026 02:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794537482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6oMQ0ylQN5TvEq36gMwt7lfEmkvwTh4q5WvifwoqGY=; b=sbOjb1LnEjXgLgfwNuus3HN+T/iT0+gsiU6E20YKStFtAWOApuKvb8UGU02seF8Kzn9ELe NE6qEjdVH2bpx//N0mTBYD+djyuZk2i62hmikEDhnZNyqlhA8yqUK7BVpoROles7/P7x3Q zQs1tnbqIribNETSLUcHKtvITxdS/kB1it4tQDULxmO1OinmJPS4wp7pQjlf8JCYnxMq7j UXp47OWvcVMBMmLR/EvmHb+n8xNZOJ3AN2OaOK2SlUaXrC5RfUGK7XbyPGOVHsO+SrjR9M 8Ma8pLn7AxRj0mfpIXHEPkVjubSpm9oZjwWltfME5cjWhzuNKX7csweVmNJ7FA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794537482; b=d2PY9AvK7M0kRdjvjPdOBDFzUQ53hS7XE2le0e7n9SNKZ33yAVyfQp4u5/B3i1cDcBw7cg WGEpi/wWru0qfdvV4NWY7A7x43hiH8kVgTvXm1u9U1sFIkqFZfOce6iBXbFjdFZJ49xrn3 mDYYjWDws0tXRkBtPMTj+UiryVsA6JJstPAFr1G3RHGEg+y/TUmniNe5m4EyN+0Tf/FsFm 8yHhoiwNwapB9lGdQ4NZ/JVQqPjGFEnSOBkGrGjUkHjPJ44R+W0Y0vKmmD1RCjw5CJ/Z9s X4Kzn4PaiVPRIer+17mWCD6AahfvKI20JUgUSRoZEdIPUPuxtcbZYydFWsMFUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794537482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6oMQ0ylQN5TvEq36gMwt7lfEmkvwTh4q5WvifwoqGY=; b=xjC54W/X84VmmCOCX/DJrGOqMA00LATvx+BnEQL0DabY8ZQ1XoFsjAAnFy9oIsVZnHRwzz wNC/PWz5gxXlCoyuqV9T8/OYCtB0G23PULJI1t76+R06NMJ9EtVTy3v1eEq7IFTBzAxXfe Ff0COnemKlMfxYwInzftc9r7eKWwNvsSZF5GNTiBl2ZdzbftRpqEOSqxHTX1/8fJbykpRJ 8Dg6CHRb5fW8mGlMyJd4N2D6snOatV11RiIMFFA4hc3jbP/JIHdPt3sccTmfhtQWBGuEHZ oSWHS6JPDpwVfs7TgK7cg8R1X7Md2rZnoMJhDGdqrrq/sfZSYSqRYjbnizx+Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQhJB2rYGzFGy for ; Fri, 13 Nov 2026 02:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20930 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 02:38:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 4edbd4e35c4e - main - snmp_hostres(3): strengthen work on the devd(8) socket List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4edbd4e35c4e0fb7cf10ed5e9b12a2b76bef2cec Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 02:38:02 +0000 Message-Id: <6af6780a.20930.2a8c3144@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4edbd4e35c4e0fb7cf10ed5e9b12a2b76bef2cec commit 4edbd4e35c4e0fb7cf10ed5e9b12a2b76bef2cec Author: Gleb Smirnoff AuthorDate: 2026-11-13 02:37:33 +0000 Commit: Gleb Smirnoff CommitDate: 2026-11-13 02:37:33 +0000 snmp_hostres(3): strengthen work on the devd(8) socket Use the SOCK_SEQPACKET version of the socket. This guarantees that messages read won't be glued together. Use sufficient buffer size to read any message. Close socket on any kind of error or a short read. This also fixes a bug when a SOCK_STREAM socket containing exactly multiple of 512 bytes would block the daemon in read(2) until some other devd(8) event. Thank to David for catching and analyzing it. Reported by: David Pfitzner Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D61146 --- .../modules/snmp_hostres/hostres_device_tbl.c | 72 +++++++++------------- .../bsnmpd/modules/snmp_hostres/hostres_snmp.h | 3 - 2 files changed, 28 insertions(+), 47 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c index b769b17484a4..80f20aba0b9b 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -82,10 +83,11 @@ static uint64_t device_tick = 0; /* maximum number of ticks between updates of device table */ uint32_t device_tbl_refresh = 10 * 100; -/* socket for /var/run/devd.pipe */ +/* socket to devd(8) */ static int devd_sock = -1; +static size_t devd_maxrecord; -/* used to wait notifications from /var/run/devd.pipe */ +/* used to wait notifications from devd(8) */ static void *devd_fd; /* some constants */ @@ -401,29 +403,26 @@ device_collector(struct devinfo_dev *dev, void *arg) static int create_devd_socket(void) { + struct sockaddr_un devd_addr = { + .sun_family = AF_LOCAL, + .sun_len = sizeof(devd_addr), + .sun_path = _PATH_DEVD_SOCKET, + }; int d_sock; - struct sockaddr_un devd_addr; - bzero(&devd_addr, sizeof(struct sockaddr_un)); - - if ((d_sock = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) { + if ((d_sock = socket(PF_LOCAL, SOCK_SEQPACKET, 0)) < 0) { syslog(LOG_ERR, "Failed to create the socket for %s: %m", - PATH_DEVD_PIPE); + devd_addr.sun_path); return (-1); } - devd_addr.sun_family = PF_LOCAL; - devd_addr.sun_len = sizeof(devd_addr); - strlcpy(devd_addr.sun_path, PATH_DEVD_PIPE, - sizeof(devd_addr.sun_path) - 1); - if (connect(d_sock, (struct sockaddr *)&devd_addr, sizeof(devd_addr)) == -1) { syslog(LOG_ERR,"Failed to connect socket for %s: %m", - PATH_DEVD_PIPE); + devd_addr.sun_path); if (close(d_sock) < 0 ) syslog(LOG_ERR,"Failed to close socket for %s: %m", - PATH_DEVD_PIPE); + devd_addr.sun_path); return (-1); } @@ -439,46 +438,29 @@ create_devd_socket(void) static void devd_socket_callback(int fd, void *arg __unused) { - char buf[512]; - int read_len = -1; + char buf[devd_maxrecord]; + ssize_t len; assert(fd == devd_sock); HRDBG("called"); -again: - read_len = read(fd, buf, sizeof(buf)); - if (read_len < 0) { - if (errno == EBADF) { - devd_sock = -1; - if (devd_fd != NULL) { - fd_deselect(devd_fd); - devd_fd = NULL; - } - syslog(LOG_ERR, "Closing devd_fd, revert to " - "devinfo polling"); - } - - } else if (read_len == 0) { - syslog(LOG_ERR, "zero bytes read from devd pipe... " - "closing socket!"); - - if (close(devd_sock) < 0 ) - syslog(LOG_ERR, "Failed to close devd socket: %m"); - + if ((len = recv(fd, buf, devd_maxrecord, MSG_WAITALL)) > 0) { + /* Only refresh device table on a device add or remove event. */ + if (buf[0] == '+' || buf[0] == '-') + refresh_device_tbl(1); + } else { + if (len == 0) + syslog(LOG_ERR, "zero bytes read(2) on devd socket"); + else + syslog(LOG_ERR, "read(2) on devd socket: %m"); + syslog(LOG_ERR, "Reverting to devinfo polling"); + (void)close(devd_sock); devd_sock = -1; if (devd_fd != NULL) { fd_deselect(devd_fd); devd_fd = NULL; } - syslog(LOG_ERR, "Closing devd_fd, revert to devinfo polling"); - - } else { - if (read_len == sizeof(buf)) - goto again; - /* Only refresh device table on a device add or remove event. */ - if (buf[0] == '+' || buf[0] == '-') - refresh_device_tbl(1); } } @@ -494,6 +476,8 @@ init_device_tbl(void) /* no problem if that fails - just use polling mode */ devd_sock = create_devd_socket(); + + devd_maxrecord = sysconf(_SC_DEVCTL_MAXRECORD); } /** diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h index 4ea6db1403ab..8a427327bedf 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h @@ -80,9 +80,6 @@ struct statfs; #endif /*NDEBUG*/ -/* path to devd(8) output pipe */ -#define PATH_DEVD_PIPE "/var/run/devd.pipe" - #define IS_KERNPROC(kp) (((kp)->ki_flag & P_KPROC) == P_KPROC) enum snmpTCTruthValue {