diff mbox

[net-next,4/5] X25 remove bkl from causediag ioctls

Message ID 1290687523.5053.42.camel@jaunty
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

andrew hendry Nov. 25, 2010, 12:18 p.m. UTC 
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>

---
 net/x25/af_x25.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

Comments

David Miller Nov. 28, 2010, 7:13 p.m. UTC | #1 
From: Andrew Hendry <andrew.hendry@gmail.com>
Date: Thu, 25 Nov 2010 23:18:43 +1100

> 
> Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index e2eea0a..8cfc419 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1538,23 +1538,22 @@  out_dtefac_release:
 		}
 
 		case SIOCX25GCAUSEDIAG: {
-			struct x25_causediag causediag;
-			lock_kernel();
-			causediag = x25->causediag;
-			rc = copy_to_user(argp, &causediag,
-					  sizeof(causediag)) ? -EFAULT : 0;
-			unlock_kernel();
+			lock_sock(sk);
+			rc = copy_to_user(argp, &x25->causediag,
+					sizeof(x25->causediag))
+					? -EFAULT : 0;
+			release_sock(sk);
 			break;
 		}
 
 		case SIOCX25SCAUSEDIAG: {
 			struct x25_causediag causediag;
 			rc = -EFAULT;
-			lock_kernel();
 			if (copy_from_user(&causediag, argp, sizeof(causediag)))
 				break;
+			lock_sock(sk);
 			x25->causediag = causediag;
-			unlock_kernel();
+			release_sock(sk);
 			rc = 0;
 			break;