linux-kernel - Re: [GIT PULL] tpmdd: a critical bug fix for v6.4-rc1

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: <CS7OJHZ1JZ1C.199SDPTFJU10C@wks-101042-mac.ad.tuni.fi>
Date:   Thu, 27 Apr 2023 19:30:36 +0300
From:   "Jarkko Sakkinen" <jarkko@...nel.org>
To:     "Linus Torvalds" <torvalds@...ux-foundation.org>
Cc:     "Eric Snowberg" <eric.snowberg@...cle.com>,
        "Lino Sanfilippo" <l.sanfilippo@...bus.com>,
        <linux-integrity@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] tpmdd: a critical bug fix for v6.4-rc1

On Thu Apr 27, 2023 at 6:38 PM EEST, Linus Torvalds wrote:
> On Thu, Apr 27, 2023 at 4:11 AM Jarkko Sakkinen <jarkko@...nel.org> wrote:
> >
> > This PR fixes a critical bug in my first pull request.
>
> That doesn't work AT ALL.
>
> You have this duplicated line
>
> -       TPM_CHIP_FLAG_FIRMWARE_UPGRADE  = BIT(7),
> +       TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
> +       TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
> +       TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>
> in that patch (presumably due to some edit-time fat-fingering), which
> causes lots and lots of
>
>   ./include/linux/tpm.h:285:9: error: redeclaration of enumerator
> ‘TPM_CHIP_FLAG_FIRMWARE_UPGRADE’
>     285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>         |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   ./include/linux/tpm.h:284:9: note: previous definition of
> ‘TPM_CHIP_FLAG_FIRMWARE_UPGRADE’ with type ‘int’
>     284 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>         |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   ./include/linux/tpm.h:286:9: error: redeclaration of enumerator
> ‘TPM_CHIP_FLAG_FIRMWARE_UPGRADE’
>     286 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>         |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> errors.
>
> While I could easily just remove the duplicated lines in my merge,
> that would make things non-bisectable, so I unpulled this instead.
>
>              Linus

My bad, please do not. I'll send a new one, cherry pick gone wrong :-(

BR, Jarkko