diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-09 11:44:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-09 11:44:44 -0800 |
| commit | b1109bf085c8dd69537b7876ea83f914dd1fe46a (patch) | |
| tree | 086bd9891a8c92284ea148c93f2242e6c7c02bd2 /net/irda | |
| parent | 889b8f964f2f226b7cd5a0a515109e3d8d9d1613 (diff) | |
| parent | 44bfce5c3ec91baf8ffcd075c66711740f29a949 (diff) | |
| download | linux-stable-b1109bf085c8dd69537b7876ea83f914dd1fe46a.tar.gz linux-stable-b1109bf085c8dd69537b7876ea83f914dd1fe46a.tar.bz2 linux-stable-b1109bf085c8dd69537b7876ea83f914dd1fe46a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/irda')
| -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, |