From nobody Sun May 4 01:11:10 2025 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 4ZqmnW023fz5tyRf; Sun, 04 May 2025 01:11:11 +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 4ZqmnV4K2jz45FT; Sun, 04 May 2025 01:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746321070; 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=tZ+Ix3VEt4M4hylNIA1Iz0sU0Vpm52A07Hi1IL+4M+4=; b=jQFPLJRHnGZxWvILdelXPegeMPZ0oStC3XR6uVd5sXu0sYtiH9vyNhBe7Zac/X1DH3wp0t htjNIh8ELcOxdpNpK1FsrWGUl/UI9qn8RnO380Qmu8HMz3EIXEOs5s+dqdnjuRWMQ7id3S gzeLoZfVSvV4nz6Sf7AYKzAgK1GM2e8nq0aKnM8ro9iaNnqCtJismRCvS8c9GMmTBr+6mS +iyCx1lHj915FOTrEx+PXpX9JVr4N4S5M9OwyYbk5RyDo5e4sBJ/K5YeCJaloDwCh8h0q8 gOleW9BlTPD3JEYOc3Ef+zgbpRNqqOHNBBbeL/oJcUOoVtBz/1mbwJDeBnU5nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746321070; 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=tZ+Ix3VEt4M4hylNIA1Iz0sU0Vpm52A07Hi1IL+4M+4=; b=vim/CpYlhzaucGDxMkfyC2aDhmcFmX3asYuPbx+HbQEGY6CsR1ONksbkGk3FVZb3XUirzY /R1Yi1EoiBEX+57N0We6N5P//ymnfGROAIp8HcvdO0cPDvP1aEI+LOlIYy+gTlSqc/+/Wr ptTsX9fZcP8zKQMEPpyzxWQXslJ3++WuKYpT67obyGMPREw10GlRuVzrZrmGVoazbrEjQA wB9JK30Hzae1eCVYzNHMTNZA7qWl/dQsMGWCQcOnm3aw0BXCx+Be7d/wXDqziGWlRZR5oZ r7lniji+1m6VSNZZBkWKx4mCvp296TCR6j1tTcCMaQ2SF8k838wtATe8s5BvlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746321070; a=rsa-sha256; cv=none; b=YwFNXIpHc/4N/3eEBlBCbochOcqFULZzGz+4jmwf57bkikHRsrXpyEA5QBPnBnWaDN0sgy oH8hLQJ3jQFnbGI2iQiOErShR6XYdYbrMyTXoQISPTn87pJqiCRuX7LejYwViopgEgG0D7 TQccpnFnubg58vv15FW21hOsxlUlfJSrk0dsZORrGClOTgvwxeQd0ZaJdSAE0abAT6qz+J GKOM7hTfat3NT1vOK0AVkjbMafS3q/unujk5SN81O21gW/zbJXwVS92Wb0UVDYIYEdbWU0 anktGbQC9zWVtryCTYt1dTV6kZhCn26kbgHQ9jkdQsDfCjmxH+K9seOHcZ+FtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZqmnV3fxsz16Lg; Sun, 04 May 2025 01:11:10 +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 5441BAwA064104; Sun, 4 May 2025 01:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5441BAHw064101; Sun, 4 May 2025 01:11:10 GMT (envelope-from git) Date: Sun, 4 May 2025 01:11:10 GMT Message-Id: <202505040111.5441BAHw064101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 70369e4c2c1a - stable/13 - mountd: Fix updating the network/host(s) for an exports line 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 70369e4c2c1a882fcf9abf293b305f4f8a0b0c16 Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=70369e4c2c1a882fcf9abf293b305f4f8a0b0c16 commit 70369e4c2c1a882fcf9abf293b305f4f8a0b0c16 Author: Rick Macklem AuthorDate: 2025-05-01 23:17:20 +0000 Commit: Rick Macklem CommitDate: 2025-05-04 01:08:24 +0000 mountd: Fix updating the network/host(s) for an exports line Mountd reloads the exports(5) file(s) when it receives a SIGHUP and then compares the old and new exports, updating any ones that have changed in the kernel. Without this patch, mountd failed to recognize that a network/host(s) had changed, if there was no other change to the exports line. As such, the change of network/hosts(s) did not take effect until the mountd daemon was (re)started. This patch fixes the code so that it checks for changes in the network/host(s) list for an exports line. PR: 286260 (cherry picked from commit 68daa781c1f12e1cfef768030eaff970c3d35543) --- usr.sbin/mountd/mountd.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 251b36e39d8b..575d1dc69079 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -239,6 +239,7 @@ static void free_exports(struct exportlisthead *); static void read_exportfile(int); static int compare_nmount_exportlist(struct iovec *, int, char *); static int compare_export(struct exportlist *, struct exportlist *); +static int compare_addr(struct grouplist *, struct grouplist *); static int compare_cred(struct expcred *, struct expcred *); static int compare_secflavor(int *, int *, int); static void delete_export(struct iovec *, int, struct statfs *, char *); @@ -2298,7 +2299,8 @@ compare_export(struct exportlist *ep, struct exportlist *oep) grp->gr_exflags == ogrp->gr_exflags && compare_cred(&grp->gr_anon, &ogrp->gr_anon) == 0 && compare_secflavor(grp->gr_secflavors, - ogrp->gr_secflavors, grp->gr_numsecflavors) == 0) + ogrp->gr_secflavors, grp->gr_numsecflavors) == 0 && + compare_addr(grp, ogrp) == 0) break; if (ogrp != NULL) ogrp->gr_flag |= GR_FND; @@ -2311,6 +2313,46 @@ compare_export(struct exportlist *ep, struct exportlist *oep) return (0); } +/* + * Compare the addresses in the group. It is safe to return they are not + * the same when the are, so only return they are the same when they are + * exactly the same. + */ +static int +compare_addr(struct grouplist *grp, struct grouplist *ogrp) +{ + struct addrinfo *ai, *oai; + + if (grp->gr_type != ogrp->gr_type) + return (1); + switch (grp->gr_type) { + case GT_HOST: + ai = grp->gr_ptr.gt_addrinfo; + oai = ogrp->gr_ptr.gt_addrinfo; + for (; ai != NULL && oai != NULL; ai = ai->ai_next, + oai = oai->ai_next) { + if (sacmp(ai->ai_addr, oai->ai_addr, NULL) != 0) + return (1); + } + if (ai != NULL || oai != NULL) + return (1); + break; + case GT_NET: + /* First compare the masks and then the nets. */ + if (sacmp((struct sockaddr *)&grp->gr_ptr.gt_net.nt_mask, + (struct sockaddr *)&ogrp->gr_ptr.gt_net.nt_mask, NULL) != 0) + return (1); + if (sacmp((struct sockaddr *)&grp->gr_ptr.gt_net.nt_net, + (struct sockaddr *)&ogrp->gr_ptr.gt_net.nt_net, + (struct sockaddr *)&grp->gr_ptr.gt_net.nt_mask) != 0) + return (1); + break; + default: + return (1); + } + return (0); +} + /* * This algorithm compares two arrays of "n" items. It returns 0 if they are * the "same" and 1 otherwise. Although suboptimal, it is always safe to