2013-06-23 02:13:56

by Gustavo Padovan

[permalink] [raw]
Subject: pull request: bluetooth 2013-06-23

Hi John,

A important fix to 3.10, this patch fixes an issues that was preventing the
l2cap info response command to be handled properly. Please pull. Thanks!

Gustavo

---
The following changes since commit fcb3701849957917a234a61b58ad70ed35c83eda:

brcmfmac: free primary net_device when brcmf_bus_start() fails (2013-06-13 13:24:12 -0400)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master

for you to fetch changes up to 3f6fa3d489e127ca5a5b298eabac3ff5dbe0e112:

Bluetooth: Fix invalid length check in l2cap_information_rsp() (2013-06-23 00:24:58 +0100)

----------------------------------------------------------------
Jaganath Kanakkassery (1):
Bluetooth: Fix invalid length check in l2cap_information_rsp()

net/bluetooth/l2cap_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)


Attachments:
(No filename) (891.00 B)
(No filename) (836.00 B)
Download all attachments

2013-06-25 21:00:44

by Gustavo Padovan

[permalink] [raw]
Subject: Re: pull request: bluetooth 2013-06-23

Hi Marcel,

* Marcel Holtmann <[email protected]> [2013-06-25 13:49:19 -0700]:

> Hi Pavel,
>
> >> Jaganath Kanakkassery (1):
> >> Bluetooth: Fix invalid length check in l2cap_information_rsp()
> >
> > Could we add the "3.10 vs. thinkpad x60" patch that fixes regression?
> > It is from Johan Hedberg…
>
> that one went into net-next tree. It is scheduled for 3.11 right now.
>
> After 3.10 is out, maybe it can go into -stable, but otherwise I think it is bit late now. Unless someone wants to cherry-pick it.

That patch is actually in 3.10 already, it was included in the last pull
request and John took it to wireless.git.

Gustavo

2013-06-25 20:12:19

by Pavel Machek

[permalink] [raw]
Subject: Re: pull request: bluetooth 2013-06-23

Hi!

> Jaganath Kanakkassery (1):
> Bluetooth: Fix invalid length check in l2cap_information_rsp()

Could we add the "3.10 vs. thinkpad x60" patch that fixes regression?
It is from Johan Hedberg...
Pavel

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2013-06-23 07:58:17

by Johan Hedberg

[permalink] [raw]
Subject: Re: pull request: bluetooth 2013-06-23

Hi,

On Sun, Jun 23, 2013, Gustavo Padovan wrote:
> A important fix to 3.10, this patch fixes an issues that was preventing the
> l2cap info response command to be handled properly. Please pull. Thanks!

I'd like to add here (since it's not obvious) that this is not just
about failing to parse the L2CAP info response. Once the code gives up
parsing this PDU it also gives up essential parts of the L2CAP
connection creation process, i.e. without this patch the stack will fail
to establish connections properly. So it'd be very good if we can get
this into 3.10 (as well as the stable trees where the patch that
introduced this bug is already on its way).

Johan

2013-06-26 12:47:40

by Gustavo Padovan

[permalink] [raw]
Subject: Re: pull request: bluetooth 2013-06-23

* Pavel Machek <[email protected]> [2013-06-26 13:52:55 +0200]:

> On Tue 2013-06-25 22:00:39, Gustavo Padovan wrote:
> > Hi Marcel,
> >
> > * Marcel Holtmann <[email protected]> [2013-06-25 13:49:19 -0700]:
> >
> > > Hi Pavel,
> > >
> > > >> Jaganath Kanakkassery (1):
> > > >> Bluetooth: Fix invalid length check in l2cap_information_rsp()
> > > >
> > > > Could we add the "3.10 vs. thinkpad x60" patch that fixes regression?
> > > > It is from Johan Hedberg…
> > >
> > > that one went into net-next tree. It is scheduled for 3.11 right now.
> > >
> > > After 3.10 is out, maybe it can go into -stable, but otherwise I think it is bit late now. Unless someone wants to cherry-pick it.
> >
> > That patch is actually in 3.10 already, it was included in the last pull
> > request and John took it to wireless.git.
>
> Is it? I tried pulling yesterday (some updates) and today (no
> changes), am on:

Dave already pulled it so it should land in mainline anytime soon.

Gustavo

2013-06-24 18:00:11

by John W. Linville

[permalink] [raw]
Subject: Re: pull request: bluetooth 2013-06-23

On Sun, Jun 23, 2013 at 03:13:51AM +0100, Gustavo Padovan wrote:
> Hi John,
>
> A important fix to 3.10, this patch fixes an issues that was preventing the
> l2cap info response command to be handled properly. Please pull. Thanks!
>
> Gustavo
>
> ---
> The following changes since commit fcb3701849957917a234a61b58ad70ed35c83eda:
>
> brcmfmac: free primary net_device when brcmf_bus_start() fails (2013-06-13 13:24:12 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master
>
> for you to fetch changes up to 3f6fa3d489e127ca5a5b298eabac3ff5dbe0e112:
>
> Bluetooth: Fix invalid length check in l2cap_information_rsp() (2013-06-23 00:24:58 +0100)
>
> ----------------------------------------------------------------
> Jaganath Kanakkassery (1):
> Bluetooth: Fix invalid length check in l2cap_information_rsp()
>
> net/bluetooth/l2cap_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Pulling now...

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2013-06-26 11:52:57

by Pavel Machek

[permalink] [raw]
Subject: Re: pull request: bluetooth 2013-06-23

On Tue 2013-06-25 22:00:39, Gustavo Padovan wrote:
> Hi Marcel,
>
> * Marcel Holtmann <[email protected]> [2013-06-25 13:49:19 -0700]:
>
> > Hi Pavel,
> >
> > >> Jaganath Kanakkassery (1):
> > >> Bluetooth: Fix invalid length check in l2cap_information_rsp()
> > >
> > > Could we add the "3.10 vs. thinkpad x60" patch that fixes regression?
> > > It is from Johan Hedberg…
> >
> > that one went into net-next tree. It is scheduled for 3.11 right now.
> >
> > After 3.10 is out, maybe it can go into -stable, but otherwise I think it is bit late now. Unless someone wants to cherry-pick it.
>
> That patch is actually in 3.10 already, it was included in the last pull
> request and John took it to wireless.git.

Is it? I tried pulling yesterday (some updates) and today (no
changes), am on:

Linux amd 3.10.0-rc7+ #267 SMP Tue Jun 25 23:32:24 CEST 2013 i686
GNU/Linux

and bluetooth is still broken :-(.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2013-06-25 20:49:18

by Marcel Holtmann

[permalink] [raw]
Subject: Re: pull request: bluetooth 2013-06-23

Hi Pavel,

>> Jaganath Kanakkassery (1):
>> Bluetooth: Fix invalid length check in l2cap_information_rsp()
>
> Could we add the "3.10 vs. thinkpad x60" patch that fixes regression?
> It is from Johan Hedberg?

that one went into net-next tree. It is scheduled for 3.11 right now.

After 3.10 is out, maybe it can go into -stable, but otherwise I think it is bit late now. Unless someone wants to cherry-pick it.

Regards

Marcel


2013-07-15 12:28:19

by Pavel Machek

[permalink] [raw]
Subject: Re: pull request: bluetooth 2013-06-23

>On Wed 2013-06-26 13:47:36, Gustavo Padovan wrote:
> * Pavel Machek <[email protected]> [2013-06-26 13:52:55 +0200]:
>
> > On Tue 2013-06-25 22:00:39, Gustavo Padovan wrote:
> > > Hi Marcel,
> > >
> > > * Marcel Holtmann <[email protected]> [2013-06-25 13:49:19 -0700]:
> > >
> > > > Hi Pavel,
> > > >
> > > > >> Jaganath Kanakkassery (1):
> > > > >> Bluetooth: Fix invalid length check in l2cap_information_rsp()
> > > > >
> > > > > Could we add the "3.10 vs. thinkpad x60" patch that fixes regression?
> > > > > It is from Johan Hedberg…
> > > >
> > > > that one went into net-next tree. It is scheduled for 3.11 right now.
> > > >
> > > > After 3.10 is out, maybe it can go into -stable, but otherwise I think it is bit late now. Unless someone wants to cherry-pick it.
> > >
> > > That patch is actually in 3.10 already, it was included in the last pull
> > > request and John took it to wireless.git.
> >
> > Is it? I tried pulling yesterday (some updates) and today (no
> > changes), am on:
>
> Dave already pulled it so it should land in mainline anytime soon.

It seems to work in 3.10 and 3.11-rc1. Thanks!
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html