Date: Fri, 24 Nov 2023 15:47:16 +0100 (CET) From: Ronald Klop <ronald-lists@klop.ws> To: Emmanuel Vadot <manu@FreeBSD.org> Cc: 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: <2003387449.7766.1700837236386@localhost> In-Reply-To: <202311240945.3AO9jgdS079780@gitrepo.freebsd.org> References: <202311240945.3AO9jgdS079780@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_7765_896222002.1700837236314 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit 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. Regards. Ronald. Van: Emmanuel Vadot <manu@FreeBSD.org> 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 <manu@FreeBSD.org> > AuthorDate: 2023-11-07 09:42:53 +0000 > Commit: Emmanuel Vadot <manu@FreeBSD.org> > 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 > } > > > > ------=_Part_7765_896222002.1700837236314 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 7bit <html><head></head><body>Hi,<br> <br> Wouldn't this apply for a /usr/src/UPDATING or /usr/src/RELNOTES entry?<br> As it might change default behaviour on a security measure.<br> <br> Regards.<br> Ronald.<br> <br> <p><strong>Van:</strong> Emmanuel Vadot <manu@FreeBSD.org><br> <strong>Datum:</strong> vrijdag, 24 november 2023 10:45<br> <strong>Aan:</strong> src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org<br> <strong>Onderwerp:</strong> git: 0b7c89c8c236 - main - autofs: media: Don't include nosuid in the script</p> <blockquote style="padding-right: 0px; padding-left: 5px; margin-left: 5px; border-left: #000000 2px solid; margin-right: 0px"> <div class="MessageRFC822Viewer" id="P"> <div class="TextPlainViewer" id="P.P">The branch main has been updated by manu:<br> <br> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e">https://cgit.FreeBSD.org/src/commit/?id=0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e</a><br>; <br> commit 0b7c89c8c236fcfabd1abd59c6b8274c7eb80f5e<br> Author: Emmanuel Vadot <manu@FreeBSD.org><br> AuthorDate: 2023-11-07 09:42:53 +0000<br> Commit: Emmanuel Vadot <manu@FreeBSD.org><br> CommitDate: 2023-11-24 09:44:20 +0000<br> <br> autofs: media: Don't include nosuid in the script<br> <br> We already have nosuid option in auto_master so no need to redefine it.<br> Also it's easier for a user to modify the auto_master configuration file<br> than the script (which shouldn't be modified).<br> <br> Sponsored by: Beckhoff Automation GmbH & Co. KG<br> Differential Revision: <a href="https://reviews.freebsd.org/D42492">https://reviews.freebsd.org/D42492</a><br>; Reviewed by: rew<br> ---<br> usr.sbin/autofs/autofs/special_media | 8 ++++----<br> 1 file changed, 4 insertions(+), 4 deletions(-)<br> <br> diff --git a/usr.sbin/autofs/autofs/special_media b/usr.sbin/autofs/autofs/special_media<br> index d72ddddddb2e..33fa4544d028 100755<br> --- a/usr.sbin/autofs/autofs/special_media<br> +++ b/usr.sbin/autofs/autofs/special_media<br> @@ -40,7 +40,7 @@ print_map_entry() {<br> case "${_fstype}" in<br> "exfat")<br> if [ -f "/usr/local/sbin/mount.exfat" ]; then<br> - echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},nosuid :/dev/${_p}"<br> + echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype} :/dev/${_p}"<br> else<br> /usr/bin/logger -p info -t "special_media[$$]" \<br> "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first"<br> @@ -49,7 +49,7 @@ print_map_entry() {<br> ;;<br> "ntfs")<br> if [ -f "/usr/local/bin/ntfs-3g" ]; then<br> - echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid :/dev/${_p}"<br> + echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype} :/dev/${_p}"<br> else<br> /usr/bin/logger -p info -t "special_media[$$]" \<br> "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first"<br> @@ -57,10 +57,10 @@ print_map_entry() {<br> fi<br> ;;<br> "ext2fs" | "msdosfs")<br> - echo "-fstype=${_fstype},nosuid,async :/dev/${_p}"<br> + echo "-fstype=${_fstype},async :/dev/${_p}"<br> ;;<br> *)<br> - echo "-fstype=${_fstype},nosuid :/dev/${_p}"<br> + echo "-fstype=${_fstype} :/dev/${_p}"<br> ;;<br> esac<br> }<br> </div> <hr></div> </blockquote> <br> </body></html> ------=_Part_7765_896222002.1700837236314--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2003387449.7766.1700837236386>