From nobody Sat Nov 14 19:52:46 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 4jRlCf5pycz70Tll for ; Sat, 14 Nov 2026 19:52:46 +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 4jRlCf44hxz542w for ; Sat, 14 Nov 2026 19:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794685966; 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=y6kt8BG4aEUojKakeKWifJF+IvnW/fD3gdvoZqLTNU4=; b=dOfU50i2jQoM61LWezVFDiw5E+xy/e1hdeGMP4NsC5Pw44DCRJVfV4iixU7A90xrzNtLev afW60ZvZGbCB1a6LPwdDTUkDp9prSCQF4kAzsiSK+7UTCJEZf/7FfCihYJHA+KFIsCaSHe cTMjyhGsuqzWooLEYC7D2xVbQQeisO+8P1eYlgvvagBYMtWkihq4BlHAAC4NL9M1OxN5Th PFYCoYQnWONO5bEm961VFxO9SM758/I2CymWz6eIJPVJneyLsuIMPo7Gia6y3iBQf0TkLc 3Ool1Q8FvP1MJ55x0PiAncjEDvCpK2pUopGXEXeJc2hxuZ/i3+ZRH2y+C6UItw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794685966; b=v+ZdLXZq/ehuLlFPS4e+FEtn4Oooj3WU3jmWhpRv5Vf9XopZ36wsxoMaaaIsYzOo2bkwWr 9CUeONl7Pzpc7LWepbrAlMGXrDKAbVYRelM8oPhaB9edyuq05aEqRQMohTzvuEwKIrOv+m 41x4ZwOzCyKjvBgXQq8OnC8OWh5GEFqA97QXRod9AYctyDHsUOeSl2ci9nhn/87Ym64njE rBtiALKaAgJ0cw0tgb8SPbtpi9KRyD4s4D4PBmPjtfDsFoTnDm/S+A0JMhhOzUv2jmlSnZ CRo8VN4Uh1CUqyLZNBlYZCqTyD9sW0wFY+ZS+Udp/XuKcz4anH8T+DoFyYMTxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794685966; 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=y6kt8BG4aEUojKakeKWifJF+IvnW/fD3gdvoZqLTNU4=; b=DDwPcFE7pgB+Ppo/h+JmtWo+T6ay+WkFlKkzRwGgj2MUGJwpR5ff8ybJ48eXiEqzNqGl8R 3iUQ6vX/JHzRVjfahuu6y5GHM42SN2+hb57RlSIqen7u7181lwM8edhK3TwI+n61H5jFXa VFjH1gjqt598jj5ASTIpmw6WqiBLbGXYxiCUgMmKIBBziDJK/MhMDfBRAg8a6QZm3cfzbL fXo372xFwqtqi2oQ6l5EmygX8cgKaXjjAGnzR/VpaOXR4vT1SkdtD49ItT839n+t5+S46U KjNc+dIGoE1o8gZSBfjsdRJo88h6ygWloOS4hU2Vc19IckcHH79xxXEAWtA7rg== 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 4jRlCf38VCzb1F for ; Sat, 14 Nov 2026 19:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cc67 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Nov 2026 19:52:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b352368bfbe8 - main - snmp_hostres(3): check if sysconf(3) fails 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: b352368bfbe85aa73840c4b8d161bcffbc242ca3 Auto-Submitted: auto-generated Date: Sat, 14 Nov 2026 19:52:46 +0000 Message-Id: <6af8bc0e.cc67.61b38739@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b352368bfbe85aa73840c4b8d161bcffbc242ca3 commit b352368bfbe85aa73840c4b8d161bcffbc242ca3 Author: Gleb Smirnoff AuthorDate: 2026-11-14 19:50:40 +0000 Commit: Gleb Smirnoff CommitDate: 2026-11-14 19:50:40 +0000 snmp_hostres(3): check if sysconf(3) fails While here inline single time use function. Reported by: llm-postcr Fixes: 4edbd4e35c4e0fb7cf10ed5e9b12a2b76bef2cec --- .../modules/snmp_hostres/hostres_device_tbl.c | 63 ++++++++++------------ 1 file changed, 28 insertions(+), 35 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 80f20aba0b9b..7de7a79417ff 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c @@ -397,38 +397,6 @@ device_collector(struct devinfo_dev *dev, void *arg) return (devinfo_foreach_device_child(dev, device_collector, arg)); } -/** - * Create the socket to the device daemon. - */ -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; - - if ((d_sock = socket(PF_LOCAL, SOCK_SEQPACKET, 0)) < 0) { - syslog(LOG_ERR, "Failed to create the socket for %s: %m", - devd_addr.sun_path); - return (-1); - } - - if (connect(d_sock, (struct sockaddr *)&devd_addr, - sizeof(devd_addr)) == -1) { - syslog(LOG_ERR,"Failed to connect socket for %s: %m", - devd_addr.sun_path); - if (close(d_sock) < 0 ) - syslog(LOG_ERR,"Failed to close socket for %s: %m", - devd_addr.sun_path); - return (-1); - } - - return (d_sock); -} - /* * Event on the devd socket. * @@ -470,14 +438,39 @@ devd_socket_callback(int fd, void *arg __unused) void init_device_tbl(void) { + struct sockaddr_un devd_addr = { + .sun_family = AF_LOCAL, + .sun_len = sizeof(devd_addr), + .sun_path = _PATH_DEVD_SOCKET, + }; + long maxrecord; + int s; /* initially populate table for the other tables */ refresh_device_tbl(1); - /* no problem if that fails - just use polling mode */ - devd_sock = create_devd_socket(); + /* No problem if devd socket creation fails - just use polling mode. */ + if ((maxrecord = sysconf(_SC_DEVCTL_MAXRECORD)) == -1) { + syslog(LOG_ERR, "Failed to get devd maximum record size: %m"); + return; + } + if ((s = socket(PF_LOCAL, SOCK_SEQPACKET, 0)) < 0) { + syslog(LOG_ERR, "Failed to create the socket for %s: %m", + devd_addr.sun_path); + return; + } + if (connect(s, (struct sockaddr *)&devd_addr, sizeof(devd_addr)) == + -1) { + syslog(LOG_ERR,"Failed to connect socket for %s: %m", + devd_addr.sun_path); + if (close(s) < 0 ) + syslog(LOG_ERR,"Failed to close socket for %s: %m", + devd_addr.sun_path); + return; + } - devd_maxrecord = sysconf(_SC_DEVCTL_MAXRECORD); + devd_sock = s; + devd_maxrecord = maxrecord; } /**