From nobody Wed Dec 06 15:36:39 2023 X-Original-To: dev-commits-src-branches@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 4SlhMq50V4z53b3G; Wed, 6 Dec 2023 15:36:39 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlhMq44k7z4NgG; Wed, 6 Dec 2023 15:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876999; 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=r8gcK6xMfdU7wF+41wIrCtTPkHunslmWJanBcv9L0SM=; b=OCKai0DKL8Te80jlMaqrqAqzmUQ2EkQGe7jowpfAJHW2J3ZXLByImkoCeHFJm7E22cIjgp L1b2v8v/LXwadZp3SHGL9T77217VyPAdt6FTmb8fcrrTOunKW0MJijEW+wIocPJSkZvwZd HguwDk13nABIjPcKSm2ZeQapWEBv4QklwYkpQ53vX9BMenUfknyGwNskNLIgs5OsgtBSVY y9o9i3wCZ7Y7sVQRRISIXaF35IIDTDWASJuUN5hjYIaWABRlW3OmRyZmI0LFR0kNfiQvfS d0YrdXfIJ8T5pBNIA7pJiKzfETbprKX1ImifiZ6BaHkpwfzl59gZLPNWOBFucA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701876999; a=rsa-sha256; cv=none; b=L8pLdNzPNtn8W0WO8+tDPVGGXHTKZKcZgRkwihK84hOG5trgkPcwsIUktH1QAGkosHPxwd 3eVEMB2U68D+Xs8kSKrpxqHwXmJfeD+/yElpaAt7ch48eGYkZAw6jWn8j517uVcRERwrFZ 5Q5u8KbRTCfEKICaw205LPR+fHF+bTtRXSqYeFwQ8PAC3qLco9qaPYs5bmn/M/r/hlr51d ClEXbtX9AwB0SW/ArrD+9CcIhM/qmENWtOVO/Gafj1ncm2zBCw1Rn4Y5hKn20iQ7A3NkeN PnA5tS5JKO6rK/9zNxbsAouBGP+cWxq9aTrQN+4lva5nwdKu8TrqbDUVCnWfBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876999; 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=r8gcK6xMfdU7wF+41wIrCtTPkHunslmWJanBcv9L0SM=; b=Dz5fkLRfXEzBIpPNP5hh5fqr/uXg2EYuvE9Xt+FwG+xJNXu8CVRqZwDUGmloVXbpC63Qf1 Tyy2l2pfKouovHI1LT6aN8AiFup13VXlrT5/uZ1eDeIBzxyaShIQ1dJ4jQZNIGnxbbI5c8 /bWPRBAGnGHMFVxhbkq10RlE8BaTyjcFvEwhAKU7bbhQGgDq8MCdGRt/Y81JGA0JTpWtXP iddaYu95P1Snzl+/Y+NGtu+UlyotWJOlgutS6PRNzzKoDCQQqDOlrDbBaHITlyR30Fam7z m/I6ylM90se8MlFhIRGrBrZ0TvX2MtL7RayxIRbGzuAYompjOKReMo1QgUJGIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlhMq2mv7z101r; Wed, 6 Dec 2023 15:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6Fadb2035927; Wed, 6 Dec 2023 15:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6FadTZ035924; Wed, 6 Dec 2023 15:36:39 GMT (envelope-from git) Date: Wed, 6 Dec 2023 15:36:39 GMT Message-Id: <202312061536.3B6FadTZ035924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: f035d56e711d - stable/14 - CAM: Use sbuf_new_for_sysctl() in more places List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f035d56e711d1de9e4cfd924e9a8db42e842a53b Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f035d56e711d1de9e4cfd924e9a8db42e842a53b commit f035d56e711d1de9e4cfd924e9a8db42e842a53b Author: Alexander Motin AuthorDate: 2023-11-22 20:32:16 +0000 Commit: Alexander Motin CommitDate: 2023-12-06 15:35:02 +0000 CAM: Use sbuf_new_for_sysctl() in more places There is no need to allocate buffer, worry about overflows, etc. MFC after: 2 weeks (cherry picked from commit 1b44079584dc317230cf810c0fe0a8c401a5c791) --- sys/cam/ata/ata_da.c | 12 ++++-------- sys/cam/scsi/scsi_da.c | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index d1ef28300666..e9a1c175f333 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1426,7 +1426,6 @@ adazonemodesysctl(SYSCTL_HANDLER_ARGS) static int adazonesupsysctl(SYSCTL_HANDLER_ARGS) { - char tmpbuf[180]; struct ada_softc *softc; struct sbuf sb; int error, first; @@ -1434,15 +1433,14 @@ adazonesupsysctl(SYSCTL_HANDLER_ARGS) softc = (struct ada_softc *)arg1; - error = 0; first = 1; - sbuf_new(&sb, tmpbuf, sizeof(tmpbuf), 0); + sbuf_new_for_sysctl(&sb, NULL, 0, req); for (i = 0; i < sizeof(ada_zone_desc_table) / sizeof(ada_zone_desc_table[0]); i++) { if (softc->zone_flags & ada_zone_desc_table[i].value) { if (first == 0) - sbuf_printf(&sb, ", "); + sbuf_cat(&sb, ", "); else first = 0; sbuf_cat(&sb, ada_zone_desc_table[i].desc); @@ -1452,10 +1450,8 @@ adazonesupsysctl(SYSCTL_HANDLER_ARGS) if (first == 1) sbuf_printf(&sb, "None"); - sbuf_finish(&sb); - - error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req); - + error = sbuf_finish(&sb); + sbuf_delete(&sb); return (error); } diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 7a063fce128b..df44d2279fbe 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2735,7 +2735,6 @@ dazonemodesysctl(SYSCTL_HANDLER_ARGS) static int dazonesupsysctl(SYSCTL_HANDLER_ARGS) { - char tmpbuf[180]; struct da_softc *softc; struct sbuf sb; int error, first; @@ -2743,15 +2742,14 @@ dazonesupsysctl(SYSCTL_HANDLER_ARGS) softc = (struct da_softc *)arg1; - error = 0; first = 1; - sbuf_new(&sb, tmpbuf, sizeof(tmpbuf), 0); + sbuf_new_for_sysctl(&sb, NULL, 0, req); for (i = 0; i < sizeof(da_zone_desc_table) / sizeof(da_zone_desc_table[0]); i++) { if (softc->zone_flags & da_zone_desc_table[i].value) { if (first == 0) - sbuf_printf(&sb, ", "); + sbuf_cat(&sb, ", "); else first = 0; sbuf_cat(&sb, da_zone_desc_table[i].desc); @@ -2761,10 +2759,8 @@ dazonesupsysctl(SYSCTL_HANDLER_ARGS) if (first == 1) sbuf_printf(&sb, "None"); - sbuf_finish(&sb); - - error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req); - + error = sbuf_finish(&sb); + sbuf_delete(&sb); return (error); }