Attachment 118316 Details for Bug 160541 – file.diff

[patch] file.diff

file.diff (text/plain), 1.14 KB, created by nvass on 2011-09-07 15:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nvass

Created: 2011-09-07 15:20:06 UTC

Size: 1.14 KB

patch

obsolete

>Index: sys/contrib/pf/net/pf_ioctl.c
>===================================================================
>--- sys/contrib/pf/net/pf_ioctl.c	(revision 225405)
>+++ sys/contrib/pf/net/pf_ioctl.c	(working copy)
>@@ -1517,9 +1517,11 @@
> 			if (((struct pfioc_table *)addr)->pfrio_flags &
> 			    PFR_FLAG_DUMMY)
> 				break; /* dummy operation ok */
>-			return (EPERM);
>+			error = EPERM;
>+			goto notpermitted;
> 		default:
>-			return (EPERM);
>+			error = EPERM;
>+			goto notpermitted;
> 		}
> 
> 	if (!(flags & FWRITE))
>@@ -1564,14 +1566,18 @@
> 				flags |= FWRITE; /* need write lock for dummy */
> 				break; /* dummy operation ok */
> 			}
>-			return (EACCES);
>+			error = EACCES;
>+			goto notpermitted;
> 		case DIOCGETRULE:
> 			if (((struct pfioc_rule *)addr)->action ==
>-			    PF_GET_CLR_CNTR)
>-				return (EACCES);
>+			    PF_GET_CLR_CNTR) {
>+				error = EACCES;
>+				goto notpermitted;
>+			}
> 			break;
> 		default:
>-			return (EACCES);
>+			error = EACCES;
>+			goto notpermitted;
> 		}
> 
> 	if (flags & FWRITE)
>@@ -3909,6 +3915,8 @@
> 		rw_exit_read(&pf_consistency_lock);
> #endif
> 
>+notpermitted:
>+	/* EPERM and EACCES jump here */
> 	CURVNET_RESTORE();
> 
> 	return (error);

Actions: View | Diff

Attachments on bug 160541: 118316