linux-kernel - Re: linux-next: manual merge of the tty tree with the parisc-hd tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <eae99b8e-530e-d777-d323-ff4cb8a1ee94@gmx.de>
Date:   Mon, 30 Aug 2021 10:17:06 +0200
From:   Helge Deller <deller@....de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Greg KH <greg@...ah.com>,
        Parisc List <linux-parisc@...r.kernel.org>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Jiri Slaby <jirislaby@...nel.org>, Jiri Slaby <jslaby@...e.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the parisc-hd tree

On 8/30/21 9:33 AM, Stephen Rothwell wrote:
> Hi Helge,
>
> On Mon, 30 Aug 2021 09:14:33 +0200 Helge Deller <deller@....de> wrote:
>>
>> On 8/30/21 7:46 AM, Stephen Rothwell wrote:
>>> Today's linux-next merge of the tty tree got a conflict in:
>>>
>>>     arch/parisc/kernel/pdc_cons.c
>>>
>>> between commit:
>>>
>>>     9613b0cb3eb4 ("tty: pdc_cons, free tty_driver upon failure")
>>>
>>> from the parisc-hd tree and commits:
>>>
>>>     0524513afe45 ("tty: don't store semi-state into tty drivers")
>>>     72fdb403008c ("tty: pdc_cons, free tty_driver upon failure")
>>>
>>> from the tty tree.
>>>
>>> I fixed it up (I just used the latter version) ...
>>
>> The latter version triggers build errors.
>> Jiri's patch needs fixing. Instead of:
>> +               tty_driver_kref_put(driver);
>> it needs to be:
>> +               tty_driver_kref_put(pdc_console_tty_driver);
>>
>> Jiri, maybe you can fix it in your tree?
>> I'm happy to drop the patch from my tree.
>
> The tty tree commits first create a "driver" variable that is used
> until it is clear everything works and then it is assigned to
> pdc_console_tty_driver.

Ah, right. I didn't checked. Looks good and compiles cleanly.
I'll drop the patch from my tree, so everything is OK now.

Helge