diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 14:49:37 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 14:49:37 +0900 |
commit | 028c5d5d596651bce13d06737eb3707a7e99a30c (patch) | |
tree | e4e429858a19635ad2b5aa563bf1b4e39396d4e2 /net/irda/irnet/irnet_ppp.c | |
parent | 19f6b8b44e3f633d5d7d1ed68848b1eb89a1e800 (diff) | |
parent | 4b505db9c4c72dbd2a8e66b8d681640101325af6 (diff) | |
download | blackbird-op-linux-028c5d5d596651bce13d06737eb3707a7e99a30c.tar.gz blackbird-op-linux-028c5d5d596651bce13d06737eb3707a7e99a30c.zip |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'net/irda/irnet/irnet_ppp.c')
-rw-r--r-- | net/irda/irnet/irnet_ppp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c index 156020d138b5..6b3602de359a 100644 --- a/net/irda/irnet/irnet_ppp.c +++ b/net/irda/irnet/irnet_ppp.c @@ -698,15 +698,18 @@ dev_irnet_ioctl( /* Query PPP channel and unit number */ case PPPIOCGCHAN: + lock_kernel(); if(ap->ppp_open && !put_user(ppp_channel_index(&ap->chan), (int __user *)argp)) err = 0; + unlock_kernel(); break; case PPPIOCGUNIT: lock_kernel(); if(ap->ppp_open && !put_user(ppp_unit_number(&ap->chan), (int __user *)argp)) - err = 0; + err = 0; + unlock_kernel(); break; /* All these ioctls can be passed both directly and from ppp_generic, |