LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] Revert "mark pstore-blk as broken"
@ 2021-11-16 18:15 Kees Cook
  2021-11-17  0:23 ` Jens Axboe
  0 siblings, 1 reply; 7+ messages in thread
From: Kees Cook @ 2021-11-16 18:15 UTC (permalink / raw)
  To: Jens Axboe
  Cc: Kees Cook, Christoph Hellwig, stable, Anton Vorontsov,
	Colin Cross, Tony Luck, linux-kernel, linux-hardening

This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.

pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
("pstore/blk: Use the normal block device I/O path"), which landed in
the same release as the commit adding BROKEN.

Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 fs/pstore/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig
index 328da35da390..8adabde685f1 100644
--- a/fs/pstore/Kconfig
+++ b/fs/pstore/Kconfig
@@ -173,7 +173,6 @@ config PSTORE_BLK
 	tristate "Log panic/oops to a block device"
 	depends on PSTORE
 	depends on BLOCK
-	depends on BROKEN
 	select PSTORE_ZONE
 	default n
 	help
-- 
2.30.2


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Revert "mark pstore-blk as broken"
  2021-11-16 18:15 [PATCH] Revert "mark pstore-blk as broken" Kees Cook
@ 2021-11-17  0:23 ` Jens Axboe
  2021-11-18 18:29   ` Kees Cook
  0 siblings, 1 reply; 7+ messages in thread
From: Jens Axboe @ 2021-11-17  0:23 UTC (permalink / raw)
  To: Kees Cook
  Cc: linux-kernel, Colin Cross, Anton Vorontsov, Christoph Hellwig,
	Tony Luck, linux-hardening, stable

On Tue, 16 Nov 2021 10:15:59 -0800, Kees Cook wrote:
> This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.
> 
> pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
> ("pstore/blk: Use the normal block device I/O path"), which landed in
> the same release as the commit adding BROKEN.
> 
> 
> [...]

Applied, thanks!

[1/1] Revert "mark pstore-blk as broken"
      commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9

Best regards,
-- 
Jens Axboe



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Revert "mark pstore-blk as broken"
  2021-11-17  0:23 ` Jens Axboe
@ 2021-11-18 18:29   ` Kees Cook
  2021-11-21 10:25     ` Geert Uytterhoeven
  0 siblings, 1 reply; 7+ messages in thread
From: Kees Cook @ 2021-11-18 18:29 UTC (permalink / raw)
  To: Jens Axboe
  Cc: linux-kernel, Colin Cross, Anton Vorontsov, Christoph Hellwig,
	Tony Luck, linux-hardening, Geert Uytterhoeven

On Tue, Nov 16, 2021 at 05:23:44PM -0700, Jens Axboe wrote:
> On Tue, 16 Nov 2021 10:15:59 -0800, Kees Cook wrote:
> > This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.
> > 
> > pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
> > ("pstore/blk: Use the normal block device I/O path"), which landed in
> > the same release as the commit adding BROKEN.
> > 
> > 
> > [...]
> 
> Applied, thanks!
> 
> [1/1] Revert "mark pstore-blk as broken"
>       commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9

Thanks! I realize now what Geert meant in an earlier thread that I
actually can't split this change from a warning fix that was living in
the pstore tree (and was masked by the now removed BROKEN). Can you take
this patch as well? I've removed it from my tree now...

https://lore.kernel.org/lkml/20211118182621.1280983-1-keescook@chromium.org/

-- 
Kees Cook

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Revert "mark pstore-blk as broken"
  2021-11-18 18:29   ` Kees Cook
@ 2021-11-21 10:25     ` Geert Uytterhoeven
  2021-11-21 13:36       ` Jens Axboe
  0 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2021-11-21 10:25 UTC (permalink / raw)
  To: Kees Cook
  Cc: Jens Axboe, Linux Kernel Mailing List, Colin Cross,
	Anton Vorontsov, Christoph Hellwig, Tony Luck, linux-hardening,
	Linus Torvalds

On Thu, Nov 18, 2021 at 7:29 PM Kees Cook <keescook@chromium.org> wrote:
> On Tue, Nov 16, 2021 at 05:23:44PM -0700, Jens Axboe wrote:
> > On Tue, 16 Nov 2021 10:15:59 -0800, Kees Cook wrote:
> > > This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.
> > >
> > > pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
> > > ("pstore/blk: Use the normal block device I/O path"), which landed in
> > > the same release as the commit adding BROKEN.
> > >
> > >
> > > [...]
> >
> > Applied, thanks!
> >
> > [1/1] Revert "mark pstore-blk as broken"
> >       commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9
>
> Thanks! I realize now what Geert meant in an earlier thread that I
> actually can't split this change from a warning fix that was living in
> the pstore tree (and was masked by the now removed BROKEN). Can you take
> this patch as well? I've removed it from my tree now...
>
> https://lore.kernel.org/lkml/20211118182621.1280983-1-keescook@chromium.org/

Which is now a build error instead of a warning in Linus' tree.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Revert "mark pstore-blk as broken"
  2021-11-21 10:25     ` Geert Uytterhoeven
@ 2021-11-21 13:36       ` Jens Axboe
  2021-11-21 17:46         ` Linus Torvalds
  0 siblings, 1 reply; 7+ messages in thread
From: Jens Axboe @ 2021-11-21 13:36 UTC (permalink / raw)
  To: Geert Uytterhoeven, Kees Cook
  Cc: Linux Kernel Mailing List, Colin Cross, Anton Vorontsov,
	Christoph Hellwig, Tony Luck, linux-hardening, Linus Torvalds

On 11/21/21 3:25 AM, Geert Uytterhoeven wrote:
> On Thu, Nov 18, 2021 at 7:29 PM Kees Cook <keescook@chromium.org> wrote:
>> On Tue, Nov 16, 2021 at 05:23:44PM -0700, Jens Axboe wrote:
>>> On Tue, 16 Nov 2021 10:15:59 -0800, Kees Cook wrote:
>>>> This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.
>>>>
>>>> pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
>>>> ("pstore/blk: Use the normal block device I/O path"), which landed in
>>>> the same release as the commit adding BROKEN.
>>>>
>>>>
>>>> [...]
>>>
>>> Applied, thanks!
>>>
>>> [1/1] Revert "mark pstore-blk as broken"
>>>       commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9
>>
>> Thanks! I realize now what Geert meant in an earlier thread that I
>> actually can't split this change from a warning fix that was living in
>> the pstore tree (and was masked by the now removed BROKEN). Can you take
>> this patch as well? I've removed it from my tree now...
>>
>> https://lore.kernel.org/lkml/20211118182621.1280983-1-keescook@chromium.org/
> 
> Which is now a build error instead of a warning in Linus' tree.

Sorry, missed this reply. Kees, can you just send this one to Linus
directly? I already flushed my block patches for this week. If there's
some reason you can't let me know, and I'll do another one...

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Revert "mark pstore-blk as broken"
  2021-11-21 13:36       ` Jens Axboe
@ 2021-11-21 17:46         ` Linus Torvalds
  2021-11-21 18:04           ` Jens Axboe
  0 siblings, 1 reply; 7+ messages in thread
From: Linus Torvalds @ 2021-11-21 17:46 UTC (permalink / raw)
  To: Jens Axboe
  Cc: Geert Uytterhoeven, Kees Cook, Linux Kernel Mailing List,
	Colin Cross, Anton Vorontsov, Christoph Hellwig, Tony Luck,
	linux-hardening

On Sun, Nov 21, 2021 at 5:36 AM Jens Axboe <axboe@kernel.dk> wrote:
>
> Sorry, missed this reply. Kees, can you just send this one to Linus
> directly?

I took it from that thread.

Thanks,
             Linus

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Revert "mark pstore-blk as broken"
  2021-11-21 17:46         ` Linus Torvalds
@ 2021-11-21 18:04           ` Jens Axboe
  0 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2021-11-21 18:04 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Geert Uytterhoeven, Kees Cook, Linux Kernel Mailing List,
	Colin Cross, Anton Vorontsov, Christoph Hellwig, Tony Luck,
	linux-hardening

On 11/21/21 10:46 AM, Linus Torvalds wrote:
> On Sun, Nov 21, 2021 at 5:36 AM Jens Axboe <axboe@kernel.dk> wrote:
>>
>> Sorry, missed this reply. Kees, can you just send this one to Linus
>> directly?
> 
> I took it from that thread.

Great, thank you!

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-11-21 18:05 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-16 18:15 [PATCH] Revert "mark pstore-blk as broken" Kees Cook
2021-11-17  0:23 ` Jens Axboe
2021-11-18 18:29   ` Kees Cook
2021-11-21 10:25     ` Geert Uytterhoeven
2021-11-21 13:36       ` Jens Axboe
2021-11-21 17:46         ` Linus Torvalds
2021-11-21 18:04           ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).