Date: Fri, 6 Feb 2015 21:37:19 -0800 From: Garrett Cooper <yaneurabeya@gmail.com> To: James Gritton <jamie@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org> Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail Message-ID: <B7F2EC26-83B1-4EE0-98C9-00E688BBBCC0@gmail.com> In-Reply-To: <C1CB8412-0FE4-4C8F-B238-1EEB8B584780@gmail.com> References: <201502061754.t16HssXU042750@svn.freebsd.org> <C12F653F-5697-4219-9BE6-838C5278DC09@gmail.com> <609da07b7a80b4a59fce8655370b045e@gritton.org> <C1CB8412-0FE4-4C8F-B238-1EEB8B584780@gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On Feb 6, 2015, at 21:31, Garrett Cooper <yaneurabeya@gmail.com> wrote:
> On Feb 6, 2015, at 21:27, James Gritton <jamie@freebsd.org> wrote:
>
>> On 2015-02-06 22:18, Garrett Cooper wrote:
>>> On Feb 6, 2015, at 9:54, Jamie Gritton <jamie@freebsd.org> wrote:
>>>> Modified: head/usr.sbin/jail/command.c
>>>> ==============================================================================
>>>> --- head/usr.sbin/jail/command.c Fri Feb 6 17:43:13 2015 (r278322)
>>>> +++ head/usr.sbin/jail/command.c Fri Feb 6 17:54:53 2015 (r278323)
>>>> @@ -112,6 +112,12 @@ next_command(struct cfjail *j)
>>>> if (!bool_param(j->intparams[IP_MOUNT_FDESCFS]))
>>>> continue;
>>>> j->comstring = &dummystring;
>>>> + break;
>>>> + case IP_MOUNT_PROCFS:
>>>> + if (!bool_param(j->intparams[IP_MOUNT_PROCFS]))
>>>> + continue;
>>>> + j->comstring = &dummystring;
>>>> + break;
>>> Did you intend on adding another break? The code would previously fall
>>> through to the next case statement...
>>>> case IP__OP:
>>>> case IP_STOP_TIMEOUT:
>>>> j->comstring = &dummystring;
>>
>> Yes. The code did indeed previously fall to the next case, but it was a no-op: the next case only had the same exact assignment that had just taken place (j->comstring = &dummystring). The lack of a break that had existed before was just some sloppy coding that I didn't notice at the time because it didn't actually change any behavior. Nonetheless it seemed worth correcting when I noticed it.
>
> True. I looked at the code afterwards and it looks ok. mount.procfs doesn’t exist in my environment. Is that command correct?
>
> $ which mount.procfs; echo $?
> 1
Nevermind — thinking Linux for a sec. I think I see the bug now. etc/rc.d/jail before this change used to pass ${rootdir} if it was defined, and the new code wasn’t passing that… Might want to doublecheck it, but adding the rootdir afterwards might fix that.
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - https://gpgtools.org
iQEcBAEBCgAGBQJU1aSPAAoJEMZr5QU6S73ewiQH/jFaeq4Y6BdqhaaBoWwCAvtc
3R6uSGA3djPjNoxpAoUyy0rTn91Jc0d5ThomTaDnNBVYro7vPUVlfWdrQDBIx/CP
8s6Wwx2nRMqXno9Lb4VzmUt5mHtrvNJi0qXzC82b0TaccYnMzHrg5/aPXAO1qnlE
XyK166PRwvW6CTWJgAJLjb/2qXAofG/Zw37WWwjrTcprRbiNDRQoYixXBtnAD385
Y47Jt0cqky+JHG9FDPK+HcdggFUc0MH3V/IquBtR7KPO6ImD5rRYihT4I9M+GxGc
PPWf92E/UzW24GVZK7zel3e6uppTyulQ2EvRCDUCTglYZmjAG3UfPlsi2SG9ROI=
=WPzD
-----END PGP SIGNATURE-----
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B7F2EC26-83B1-4EE0-98C9-00E688BBBCC0>