On Tue, Nov 26, 2019 at 11:56:59AM +0100, Ahmad Fatoum wrote:
> 297ac7288 ("pstore: Only capture log messages") removed the pstore console.
> v3 of the eventually merged 75a74b5c ("console: fix out-of-bounds read
> in dputc(/dev/*, ...)") reinstated part of this code, which broke the
> pstore build because the now removed bufsize member had a user
> reintroduced in the patch.
>
> Fix this by reverting the offending patch's changes to the pstore code.
> It wasn't applicable to begin with.
>
> Fixes: 75a74b5c ("console: fix out-of-bounds read in dputc(/dev/*, ...)")
> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> Hello Sascha,
>
> I broke pstore in v2019.10.0 because of the botched merge conflict
> resolve described above. Can this patch be applied to master?
Just did that.
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
