[src/netbsd-7]: src/sys/secmodel Pull up following revision(s) (requested by ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f4d0dcd82718
branches:  netbsd-7
changeset: 798501:f4d0dcd82718
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 07 08:21:31 2014 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #180):
        sys/secmodel/secmodel.c: revision 1.2
Do not release secmodels_lock when it is not held.
Sent on tech-kern@, ok lars@

diffstat:

 sys/secmodel/secmodel.c |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (35 lines):

diff -r 92c257a1e19b -r f4d0dcd82718 sys/secmodel/secmodel.c
--- a/sys/secmodel/secmodel.c   Wed Nov 05 18:24:47 2014 +0000
+++ b/sys/secmodel/secmodel.c   Fri Nov 07 08:21:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel.c,v 1.1 2011/12/04 19:24:59 jym Exp $ */
+/* $NetBSD: secmodel.c,v 1.1.26.1 2014/11/07 08:21:31 martin Exp $ */
 /*-
  * Copyright (c) 2011 Elad Efrat <elad%NetBSD.org@localhost>
  * All rights reserved.
@@ -171,10 +171,8 @@
        secmodel_t tsm;
        int error = 0;
 
-       if (sm == NULL) {
-               error = EFAULT;
-               goto out;
-       }
+       if (sm == NULL)
+               return EFAULT;
 
        /* Check if the secmodel is already present. */
        rw_enter(&secmodels_lock, RW_WRITER);
@@ -203,10 +201,8 @@
        secmodel_t tsm;
        int error = 0;
 
-       if (sm == NULL) {
-               error = EFAULT;
-               goto out;
-       }
+       if (sm == NULL)
+               return EFAULT;
 
        /* Make sure the secmodel is present. */
        rw_enter(&secmodels_lock, RW_WRITER);