Subject: [PATCH 1/2] irda: unbalanced lock_kernel in irnet_ppp

Add the missing unlock_kernel in one ioctl operation.

Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>
---
net/irda/irnet/irnet_ppp.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
index d6b502c..8d38fdd 100644
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@ -703,7 +703,8 @@ dev_irnet_ioctl(
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,
--
1.6.6.1


Subject: [PATCH 2/2] irda: add missing BKL in irnet_ppp ioctl

One ioctl has been forgotten when the BKL was push down into irnet_ppp
ioctl function.

Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>
---
net/irda/irnet/irnet_ppp.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
index 8d38fdd..67aee5c 100644
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@ -695,9 +695,11 @@ 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();
--
1.6.6.1

2010-02-04 04:14:48

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 1/2] irda: unbalanced lock_kernel in irnet_ppp

From: Thadeu Lima de Souza Cascardo <[email protected]>
Date: Mon, 1 Feb 2010 16:21:34 -0200

> Add the missing unlock_kernel in one ioctl operation.
>
> Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Applied.

2010-02-04 04:14:53

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 2/2] irda: add missing BKL in irnet_ppp ioctl

From: Thadeu Lima de Souza Cascardo <[email protected]>
Date: Mon, 1 Feb 2010 16:21:35 -0200

> One ioctl has been forgotten when the BKL was push down into irnet_ppp
> ioctl function.
>
> Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Applied.