From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Gustavo F. Padovan" Subject: Re: [patch v2] bluetooth: handle l2cap_create_connless_pdu() errors Date: Mon, 26 Apr 2010 12:09:19 -0300 Message-ID: <20100426150919.GA12813@vigoh> References: <20100422095201.GO29647@bicker> <20100422123347.GA5265@vigoh> <20100426113627.GS29093@bicker> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Marcel Holtmann , "David S. Miller" , Andrei Emeltchenko , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org To: Dan Carpenter Return-path: Received: from mail-vw0-f46.google.com ([209.85.212.46]:54177 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752673Ab0DZPQ2 (ORCPT ); Mon, 26 Apr 2010 11:16:28 -0400 Content-Disposition: inline In-Reply-To: <20100426113627.GS29093@bicker> Sender: netdev-owner@vger.kernel.org List-ID: Hi Dan, * Dan Carpenter [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 > --- > 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