Attachment 197613 Details for Bug 231773 – Patch to fix the original bug (i.e. to keep the reported "bug" broken)

[patch] Patch to fix the original bug (i.e. to keep the reported "bug" broken)

jail.diff (text/plain), 1.06 KB, created by Jamie Gritton on 2018-09-30 03:23:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jamie Gritton

Created: 2018-09-30 03:23:26 UTC

Size: 1.06 KB

patch

obsolete

>Index: sys/kern/kern_jail.c
>===================================================================
>--- sys/kern/kern_jail.c	(revision 339006)
>+++ sys/kern/kern_jail.c	(working copy)
>@@ -1393,11 +1393,12 @@ kern_jail_set(struct thread *td, struct uio *optui
> 		 * there is a duplicate on a jail with more than one
> 		 * IP stop checking and return error.
> 		 */
>-		tppr = ppr;
> #ifdef VIMAGE
>-		for (; tppr != &prison0; tppr = tppr->pr_parent)
>+		for (tppr = ppr; tppr != &prison0; tppr = tppr->pr_parent)
> 			if (tppr->pr_flags & PR_VNET)
> 				break;
>+#else
>+		tppr = &prison0;
> #endif
> 		FOREACH_PRISON_DESCENDANT(tppr, tpr, descend) {
> 			if (tpr == pr ||
>@@ -1460,11 +1461,12 @@ kern_jail_set(struct thread *td, struct uio *optui
> 			}
> 		}
> 		/* Check for conflicting IP addresses. */
>-		tppr = ppr;
> #ifdef VIMAGE
>-		for (; tppr != &prison0; tppr = tppr->pr_parent)
>+		for (tppr = ppr; tppr != &prison0; tppr = tppr->pr_parent)
> 			if (tppr->pr_flags & PR_VNET)
> 				break;
>+#else
>+		tppr = &prison0;
> #endif
> 		FOREACH_PRISON_DESCENDANT(tppr, tpr, descend) {
> 			if (tpr == pr ||

Actions: View | Diff

Attachments on bug 231773: 197577 | 197613