d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bectl(8): Don't accept jid=0 from jail_getid

Browse Source 
This will trivially exist, but we don't want it - none of our jailed BEs
will have jid=0.

MFC after:	3 days
This commit is contained in:
kevans 2019-06-02 14:05:51 +00:00
parent ebec61f967
commit 81dab68e92
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/bectl/bectl_jail.c
View File

@ -411,7 +411,12 @@ bectl_locate_jail(const char *ident)
/* Try the easy-match first */ /* Try the easy-match first */
jid = jail_getid(ident); jid = jail_getid(ident);
if (jid != -1) /*
* jail_getid(0) will always return 0, because this prison does exist.
* bectl(8) knows that this is not what it wants, so we should fall
* back to mount point search.
*/
if (jid > 0)
return (jid); return (jid);
/* Attempt to try it as a BE name, first */ /* Attempt to try it as a BE name, first */