[patch] bluetooth: handle l2cap_create_connless_pdu() errors

[patch] bluetooth: handle l2cap_create_connless_pdu() errors

[Dan Carpenter]

l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or
ERR_PTR(-EFAULT).

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 99d68c3..9753b69 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1626,7 +1626,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
 	/* Connectionless channel */
 	if (sk->sk_type == SOCK_DGRAM) {
 		skb = l2cap_create_connless_pdu(sk, msg, len);
-		err = l2cap_do_send(sk, skb);
+		if (IS_ERR(skb))
+			err = PTR_ERR(skb);
+		else
+			err = l2cap_do_send(sk, skb);
 		goto done;
 	}
 

Re: [patch] bluetooth: handle l2cap_create_connless_pdu() errors

[Gustavo F. Padovan]

Hi Dan,

* Dan Carpenter <error27@gmail.com> [2010-04-22 11:52:01 +0200]:

> l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or
> ERR_PTR(-EFAULT).
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> 
> diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
> index 99d68c3..9753b69 100644
> --- a/net/bluetooth/l2cap.c
> +++ b/net/bluetooth/l2cap.c
> @@ -1626,7 +1626,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
>  	/* Connectionless channel */
>  	if (sk->sk_type == SOCK_DGRAM) {
>  		skb = l2cap_create_connless_pdu(sk, msg, len);
> -		err = l2cap_do_send(sk, skb);
> +		if (IS_ERR(skb))
> +			err = PTR_ERR(skb);
> +		else
> +			err = l2cap_do_send(sk, skb);
>  		goto done;
>  	}

Your fix looks ok, but we have changed l2cap_do_send() to void, so you
have to modify your patch.

That change is not in the bluetooth-testingtree yet, so remote add my git
tree and use the branch ertm.

git://git.profusion.mobi/users/padovan/bluetooth-testing.git

Regards,

-- 
Gustavo F. Padovan
http://padovan.org

[patch v2] bluetooth: handle l2cap_create_connless_pdu() errors

[Dan Carpenter]

l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or
ERR_PTR(-EFAULT).

Signed-off-by: Dan Carpenter <error27@gmail.com>
---
In v2 I wrote the patch on top of Gustavo Padovon's devel tree

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index a668ef4..b32682c 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1712,8 +1712,12 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
 	/* Connectionless channel */
 	if (sk->sk_type == SOCK_DGRAM) {
 		skb = l2cap_create_connless_pdu(sk, msg, len);
-		l2cap_do_send(sk, skb);
-		err = len;
+		if (IS_ERR(skb)) {
+			err = PTR_ERR(skb);
+		} else {
+			l2cap_do_send(sk, skb);
+			err = len;
+		}
 		goto done;
 	}
 

Re: [patch v2] bluetooth: handle l2cap_create_connless_pdu() errors

[Gustavo F. Padovan]

Hi Dan,

* Dan Carpenter <error27@gmail.com> [2010-04-26 13:36:27 +0200]:

> l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or
> ERR_PTR(-EFAULT).
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> ---
> In v2 I wrote the patch on top of Gustavo Padovon's devel tree
> 
> diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
> index a668ef4..b32682c 100644
> --- a/net/bluetooth/l2cap.c
> +++ b/net/bluetooth/l2cap.c
> @@ -1712,8 +1712,12 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
>  	/* Connectionless channel */
>  	if (sk->sk_type == SOCK_DGRAM) {
>  		skb = l2cap_create_connless_pdu(sk, msg, len);
> -		l2cap_do_send(sk, skb);
> -		err = len;
> +		if (IS_ERR(skb)) {
> +			err = PTR_ERR(skb);

Remove the braces on the 'if', then we are fine to pick your patch ;)

> +		} else {
> +			l2cap_do_send(sk, skb);
> +			err = len;
> +		}
>  		goto done;
>  	}
>  


Regards,

-- 
Gustavo F. Padovan
http://padovan.org

Re: [patch v2] bluetooth: handle l2cap_create_connless_pdu() errors

[David Miller]

From: "Gustavo F. Padovan" <gustavo@padovan.org>
Date: Mon, 26 Apr 2010 12:09:19 -0300

> Hi Dan,
> 
> * Dan Carpenter <error27@gmail.com> [2010-04-26 13:36:27 +0200]:
> 
>> l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or
>> ERR_PTR(-EFAULT).
>> 
>> Signed-off-by: Dan Carpenter <error27@gmail.com>
>> ---
>> In v2 I wrote the patch on top of Gustavo Padovon's devel tree

This is the kind of bug that could cause a crash if the path actually
executes.

Therefore it tires me that that submitter was told to regenerate this
patch against some devel tree that is -next bound, when in fact this
is the kind of fix that warrants inclusion right now into net-2.6

Marcel, please do whatever magic you need to so I can get this into
Linus's tree as I did the rest of the ERR_PTR() fixes from Dan already.
No reason to treat Bluetooth special and defer these fixes to -next.

Thanks.

Re: [patch v2] bluetooth: handle l2cap_create_connless_pdu() errors

[Gustavo F. Padovan]

Hi David,

* David Miller <davem@davemloft.net> [2010-04-26 11:12:59 -0700]:

> From: "Gustavo F. Padovan" <gustavo@padovan.org>
> Date: Mon, 26 Apr 2010 12:09:19 -0300
> 
> > Hi Dan,
> > 
> > * Dan Carpenter <error27@gmail.com> [2010-04-26 13:36:27 +0200]:
> > 
> >> l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or
> >> ERR_PTR(-EFAULT).
> >> 
> >> Signed-off-by: Dan Carpenter <error27@gmail.com>
> >> ---
> >> In v2 I wrote the patch on top of Gustavo Padovon's devel tree
> 
> This is the kind of bug that could cause a crash if the path actually
> executes.
> 
> Therefore it tires me that that submitter was told to regenerate this
> patch against some devel tree that is -next bound, when in fact this
> is the kind of fix that warrants inclusion right now into net-2.6

My bad here. So I think we should pick the first version of the Dan's patch. 
It applies against bluetooth-testing right now and then against net-2.6 too.

Marcel, is that ok to you?

> 
> Marcel, please do whatever magic you need to so I can get this into
> Linus's tree as I did the rest of the ERR_PTR() fixes from Dan already.
> No reason to treat Bluetooth special and defer these fixes to -next.
> 
> Thanks.

-- 
Gustavo F. Padovan
http://padovan.org

Re: [patch v2] bluetooth: handle l2cap_create_connless_pdu() errors

[Marcel Holtmann]

Hi Dave,

> > * Dan Carpenter <error27@gmail.com> [2010-04-26 13:36:27 +0200]:
> > 
> >> l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or
> >> ERR_PTR(-EFAULT).
> >> 
> >> Signed-off-by: Dan Carpenter <error27@gmail.com>
> >> ---
> >> In v2 I wrote the patch on top of Gustavo Padovon's devel tree
> 
> This is the kind of bug that could cause a crash if the path actually
> executes.
> 
> Therefore it tires me that that submitter was told to regenerate this
> patch against some devel tree that is -next bound, when in fact this
> is the kind of fix that warrants inclusion right now into net-2.6
> 
> Marcel, please do whatever magic you need to so I can get this into
> Linus's tree as I did the rest of the ERR_PTR() fixes from Dan already.
> No reason to treat Bluetooth special and defer these fixes to -next.

my bad here. I looked at the patch and thought it was only an issue
inside the development tree. So was letting Gustavo sort this out. You
are 100% right, this needs to be fixed right away. If you wanna take
this directly, then

Acked-by: Marcel Holtmann <marcel@holtmann.org>

Regards

Marcel

Re: [patch v2] bluetooth: handle l2cap_create_connless_pdu() errors

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 27 Apr 2010 04:05:26 +0200

> my bad here. I looked at the patch and thought it was only an issue
> inside the development tree. So was letting Gustavo sort this out. You
> are 100% right, this needs to be fixed right away. If you wanna take
> this directly, then
> 
> Acked-by: Marcel Holtmann <marcel@holtmann.org>

I applied the original patch with your ACK, thanks Marcel.