fbcon: Add defensive coding to logo loader#7088
Merged
6by9 merged 2 commits intoraspberrypi:rpi-6.12.yfrom Oct 21, 2025
Merged
Conversation
6by9
force-pushed
the
rpi-6.12.y-fbcon-logo
branch
from
d48f6fd to
518ce2a
Compare
There were various points where the loader was using uninitialised data, had the potential to run off the end of an array, or was handling core functions incorrectly. Fix these up. Also handle 24bpp and 32bpp framebuffers. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
The mappings are the reverse of r8g8b8 and r5g6b5 respectively Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
6by9
force-pushed
the
rpi-6.12.y-fbcon-logo
branch
from
518ce2a to
493d19e
Compare
Contributor
Author
|
Now fixed up to work with 24 and 32bpp framebuffer devices. Amusingly Pi5 with
Both are semi-understandable as simple-framebuffer didn't have the BGR variants defined. I've added them, so we probably want to update the firmware to make use of this. |
pelwell
approved these changes
Oct 20, 2025
popcornmix
approved these changes
Oct 21, 2025
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Oct 24, 2025
kernel: drivers: pcie: Hailo: Remove Hailo PCIe driver See: raspberrypi/linux#7075 kernel: Add RTW89 USB modules to Pi defconfigs See: raspberrypi/linux#7096 kernel: media: i2c: Modify the datatype of PDAF data in the arducam_64mp driver See: raspberrypi/linux#7090 kernel: fbcon: Add defensive coding to logo loader See: raspberrypi/linux#7088
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
Oct 24, 2025
kernel: drivers: pcie: Hailo: Remove Hailo PCIe driver See: raspberrypi/linux#7075 kernel: Add RTW89 USB modules to Pi defconfigs See: raspberrypi/linux#7096 kernel: media: i2c: Modify the datatype of PDAF data in the arducam_64mp driver See: raspberrypi/linux#7090 kernel: fbcon: Add defensive coding to logo loader See: raspberrypi/linux#7088
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There were various points where the loader was using uninitialised data, had the potential to run off the end of an array, or was handling core functions incorrectly. Fix these up.
(It still goes quite badly wrong if the framebuffer isn't 16bpp)