From nobody Fri Apr 25 15:58:19 2025 X-Original-To: dev-commits-src-main@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 4ZkcvH51jKz5tjhp; Fri, 25 Apr 2025 15:58:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZkcvH4N0Wz3x1q; Fri, 25 Apr 2025 15:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745596699; 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=e6BJgVj5ezIu8kKsTlMRdusSfZHujaufevBAhHVSWNA=; b=fSOGPHlx/Uji/4qMIhuQxkV+LPf0uc+cFTTR8LMG+6wqkgzB2KKsj3Bf/7eVBhlYE7wjuR 7M+JqG1ofo8PcdykwyME+DS+Ho1XsDj0hFo35w+nJ354+nIxE/bc8r5HDOtkF4KXf0hk3l aD6TN2ejdKk8awcfxbcypGPytW6CXpS6LcwDjivRFEZ05kZVMoU5qkfmJ/VX4WLhUHuthe R4TIliKuGLbaXqGwzDRXC1mzkr9wEg/oBTW2aZyaewLG7hKg3k6vgOKy/5Iko213jTEEZs OK56KawpdJxGrL9i9WK9FXPwLaGZQzdbCo6lM+aHwduo/KiLrFU7dYIj6uWQKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745596699; a=rsa-sha256; cv=none; b=TmJhuMjDFTBaE5/yfSF7S6aMs6P+5kEwEjTjgdJ7Z4jq0Eo+hKwMmLa38iVAKP2ki9pmSF ZQDSyuN5SaRMB2mPofMA/NC1Db3C2yxdNoGJsEsazIkzJBiAQ2nZKXq+cqOewUZmko8Zz0 DBLwWlxnWX2L3xXhzJcxOriNfqsBSS4l2qSpe+y4AagueJWF+66vQ4TY4K9l5cv4DzOvIv GpF65+uTa0j6AY9pd7j3+I+WcR52g16geyA2wglLXJa8u9b/dynucEKh3C00jm0QCQpUr4 cxoQ+ccnL1T4mNOrMOOWUjVMUmJzgsJZLW2Bi0+gHxNDZWkmA6Q8H7W0/9MSTg== 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=1745596699; 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=e6BJgVj5ezIu8kKsTlMRdusSfZHujaufevBAhHVSWNA=; b=yg43OjRJ+SZEkrhbvBpSX3jpucrvshHQHDGd9fHwGbjEvkHW5xl/fQw/QA0Oo0ZosH34Ik jwd8EKCpU3cCXEI7a8Rw63pLAzWXkuYIWUg+XbMHp0o2zCLvh6upjzSufDY16OnsRRowKa YmYwI/o9ikJvZ/5Q/yHxn3z2U+Dx0i8IuQlxrnaU0BH19uyY+RDOji0UFKsr/Xgsm649AA aP/U8i9icsCV0Jah9jAVtkHRk2klKxm6VrNK0SEAwrDplqCDZXA1AAgsNjZhXQfkhvIlbm otB34L07nvBAkN6i2z3r+z/xvbDWa1fiBevjMJsRF3J8WFkzmSsakt2PDUYKjg== 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 4ZkcvH3yHHzhZn; Fri, 25 Apr 2025 15:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53PFwJ8B022637; Fri, 25 Apr 2025 15:58:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53PFwJeG022634; Fri, 25 Apr 2025 15:58:19 GMT (envelope-from git) Date: Fri, 25 Apr 2025 15:58:19 GMT Message-Id: <202504251558.53PFwJeG022634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 5fa183f02845 - main - mountd: use free_iovec for build_iovec cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fa183f02845f2f74a95efba395d0839a380fa66 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa183f02845f2f74a95efba395d0839a380fa66 commit 5fa183f02845f2f74a95efba395d0839a380fa66 Author: Brooks Davis AuthorDate: 2025-04-25 15:56:20 +0000 Commit: Brooks Davis CommitDate: 2025-04-25 15:57:24 +0000 mountd: use free_iovec for build_iovec cleanup Remove the handrolled cleanups and use free_iovec instead. No functional change intended. Logically, the change does remove one dead store to iovlen in get_exportlist(). Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D49953 --- usr.sbin/mountd/mountd.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 3c4e5e742c93..2969edd8aed5 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -2099,19 +2099,7 @@ get_exportlist(int passno) syslog(LOG_ERR, "NFSv4 requires at least one V4: line"); } - if (iov != NULL) { - /* Free strings allocated by strdup() in getmntopts.c */ - free(iov[0].iov_base); /* fstype */ - free(iov[2].iov_base); /* fspath */ - free(iov[4].iov_base); /* from */ - free(iov[6].iov_base); /* update */ - free(iov[8].iov_base); /* export */ - free(iov[10].iov_base); /* errmsg */ - - /* free iov, allocated by realloc() */ - free(iov); - iovlen = 0; - } + free_iovec(&iov, &iovlen); /* * If there was no public fh, clear any previous one set. @@ -3409,18 +3397,7 @@ skip: if (cp) *cp = savedc; error_exit: - /* free strings allocated by strdup() in getmntopts.c */ - if (iov != NULL) { - free(iov[0].iov_base); /* fstype */ - free(iov[2].iov_base); /* fspath */ - free(iov[4].iov_base); /* from */ - free(iov[6].iov_base); /* update */ - free(iov[8].iov_base); /* export */ - free(iov[10].iov_base); /* errmsg */ - - /* free iov, allocated by realloc() */ - free(iov); - } + free_iovec(&iov, &iovlen); return (ret); }