From nobody Fri Nov 24 14:51:07 2023 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 4ScHx35WKPz51MG7; Fri, 24 Nov 2023 14:51:19 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4ScHx30Lgzz4M4L; Fri, 24 Nov 2023 14:51:18 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1700837471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fKy1MTIMPd1uKgvc3dNvU5hvJRbJ7ggJoPjlEj1p6fE=; b=OAY6KAtavEkdOEQeaY/bTPLIIIsQ/tqR3A49j+v8UoTJ4H0BWKQor45BGcyZAckFYSwylO fQDrp7Us28qa91JQRMmcNvKE0B/PRK8WzkC7/hDvwBD2UdPqz9QC+jIKmsctKZm5WrOiw2 k1I+CDidAs+eD3fffcJzievOBpulX/o= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 23f6623c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 24 Nov 2023 14:51:11 +0000 (UTC) Date: Fri, 24 Nov 2023 15:51:07 +0100 From: Emmanuel Vadot To: Ronald Klop Cc: Emmanuel Vadot , dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 0b7c89c8c236 - main - autofs: media: Don't include nosuid in the script Message-Id: <20231124155107.fe95c803b3c5d0f1b18e3c9d@bidouilliste.com> In-Reply-To: <2003387449.7766.1700837236386@localhost> References: <202311240945.3AO9jgdS079780@gitrepo.freebsd.org> <2003387449.7766.1700837236386@localhost> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-Rspamd-Queue-Id: 4ScHx30Lgzz4M4L Hi, On Fri, 24 Nov 2023 15:47:16 +0100 (CET) Ronald Klop wrote: > Hi, > > Wouldn't this apply for a /usr/src/UPDATING or /usr/src/RELNOTES entry? > As it might change default behaviour on a security measure. No it doesn't. As noted in the commit message nosuid is already present in auto_master, I'm just removing a duplicate here. > Regards. > Ronald. > > > Van: Emmanuel Vadot > Datum: vrijdag, 24 november 2023 10:45 > Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org > Onderwerp: git: 0b7c89c8c236 - main - autofs: media: Don't include nosuid in the script > > > > The branch main has been updated by manu: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e > > > > commit 0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e > > Author: Emmanuel Vadot > > AuthorDate: 2023-11-07 09:42:53 +0000 > > Commit: Emmanuel Vadot > > CommitDate: 2023-11-24 09:44:20 +0000 > > > > autofs: media: Don't include nosuid in the script > > > > We already have nosuid option in auto_master so no need to redefine it. > > Also it's easier for a user to modify the auto_master configuration file > > than the script (which shouldn't be modified). > > > > Sponsored by: Beckhoff Automation GmbH & Co. KG > > Differential Revision: https://reviews.freebsd.org/D42492 > > Reviewed by: rew > > --- > > usr.sbin/autofs/autofs/special_media | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/usr.sbin/autofs/autofs/special_media b/usr.sbin/autofs/autofs/special_media > > index d72ddddddb2e..33fa4544d028 100755 > > --- a/usr.sbin/autofs/autofs/special_media > > +++ b/usr.sbin/autofs/autofs/special_media > > @@ -40,7 +40,7 @@ print_map_entry() { > > case "${_fstype}" in > > "exfat") > > if [ -f "/usr/local/sbin/mount.exfat" ]; then > > - echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},nosuid :/dev/${_p}" > > + echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype} :/dev/${_p}" > > else > > /usr/bin/logger -p info -t "special_media[$$]" \ > > "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first" > > @@ -49,7 +49,7 @@ print_map_entry() { > > ;; > > "ntfs") > > if [ -f "/usr/local/bin/ntfs-3g" ]; then > > - echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid :/dev/${_p}" > > + echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype} :/dev/${_p}" > > else > > /usr/bin/logger -p info -t "special_media[$$]" \ > > "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first" > > @@ -57,10 +57,10 @@ print_map_entry() { > > fi > > ;; > > "ext2fs" | "msdosfs") > > - echo "-fstype=${_fstype},nosuid,async :/dev/${_p}" > > + echo "-fstype=${_fstype},async :/dev/${_p}" > > ;; > > *) > > - echo "-fstype=${_fstype},nosuid :/dev/${_p}" > > + echo "-fstype=${_fstype} :/dev/${_p}" > > ;; > > esac > > } > > > > > > > > > > -- Emmanuel Vadot