Re: [PATCH v4.4/bluetooth 1/2] Bluetooth: Consolidate encryption handling in hci_encrypt_cfm

[Hans-Christian Egtvedt (hegtvedt)]

On 15/10/2020 14:02, Greg KH wrote:
> On Thu, Oct 15, 2020 at 11:18:39AM +0000, Hans-Christian Egtvedt (hegtvedt) wrote:
>> On 15/10/2020 11:57, Greg KH wrote:
>>> On Thu, Oct 15, 2020 at 09:43:32AM +0200, Hans-Christian Noren Egtvedt wrote:
>>>> From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
>>>>
>>>> This makes hci_encrypt_cfm calls hci_connect_cfm in case the connection
>>>> state is BT_CONFIG so callers don't have to check the state.
>>>>
>>>> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
>>>> Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
>>>> (cherry picked from commit 3ca44c16b0dcc764b641ee4ac226909f5c421aa3)
>>>
>>> This is only in 5.8, what about all the other stable kernels?
>>>
>>>> (cherry picked from commit 0a60996c7fa7010ea00d9b62fb6996d908a01ead)
>>>
>>> Where is this commit from?  I don't see it in Linus's tree.
>>
>> Ops, my bad, I have a Linux 4.9 branch, which also includes the Android
>> 4.9 kernel changes from Google. And since I noticed the patches in my
>> (merged from Android latest) linux-4.9.y branch, I thought the patches
>> were applied through all stable releases 4.9 and up.
> 
> I just looked at the google common android trees, and do not see this
> commit in the android-4.9-q branch.  What branch are you seeing it in?

Well this is embarrassing:

commit 0a60996c7fa7010ea00d9b62fb6996d908a01ead
Author: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
Commit: Hans-Christian Noren Egtvedt <hegtvedt@xxxxxxxxx>

>>>> ---
>>>> AFAICT, fixing CVE 2020-10135 Bluetooth impersonation attacks have been
>>>> left out for the 4.4 stable kernel. I cherry picked what I assume are
>>>> the appropriate two patches missing from the 4.9 stable kernel. Please
>>>> add them to upcoming 4.4 stable releases.
>>>
>>> Why are you merging 2 commits together?  Please provide backports for
>>> all stable kernels, if you want to see this in the 4.4.y tree.  We can
>>> not have someone move from an older tree to a newer one and have a
>>> regression.
>>
>> Agreed, I have managed to trick myself into thinking the 4.4.y branch
>> was left out, but I assume these patches are required for all LTS branches.
> 
> They are, but if you have copies of them, please feel free to share
> them.

I will repeat cherry-picking from a clean linux-stable git tree and send
patches, sorry for this noise.

I see linux-5.8.y has partial patches, while the older branches need the
full series of three commits. I just discovered an additional fix.

-- 
Best regards, Hans-Christian Noren Egtvedt

Attachment: pEpkey.asc
Description: pEpkey.asc