Author: jamie
Date: Fri Sep 10 21:45:42 2010
New Revision: 212436
URL: http://svn.freebsd.org/changeset/base/212436
Log:
Don't exit kern_jail_set without freeing options when enforce_statfs
has an illegal value.
MFC after: 3 days
Modified:
head/sys/kern/kern_jail.c
Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c Fri Sep 10 20:42:41 2010 (r212435)
+++ head/sys/kern/kern_jail.c Fri Sep 10 21:45:42 2010 (r212436)
@@ -584,12 +584,15 @@ kern_jail_set(struct thread *td, struct
gotchildmax = 1;
error = vfs_copyopt(opts, "enforce_statfs", &enforce, sizeof(enforce));
- gotenforce = (error == 0);
- if (gotenforce) {
- if (enforce < 0 || enforce > 2)
- return (EINVAL);
- } else if (error != ENOENT)
+ if (error == ENOENT)
+ gotenforce = 0;
+ else if (error != 0)
goto done_free;
+ else if (enforce < 0 || enforce > 2) {
+ error = EINVAL;
+ goto done_free;
+ } else
+ gotenforce = 1;
pr_flags = ch_flags = 0;
for (fi = 0; fi < sizeof(pr_flag_names) / sizeof(pr_flag_names[0]);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
