rpm/plymouth
SHA256
1
0
Fork 0
forked from pool/plymouth
Code Pull Requests Activity

Accepting request 358382 from home:favogt:branches:Base:System

Browse Source 
Add the third patch from the series as well, for completeness.
This fixes a crash that could theoretically happen if the font in the initrd can't be read.

Correct patch this time :-)

OBS-URL: https://build.opensuse.org/request/show/358382
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=171
This commit is contained in:
Ismail Dönmez 2016-02-08 16:17:25 +00:00 committed by Git OBS Bridge
parent aebaacf9b8
commit 274b45a4c3
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0003-fix_null_deref.patch Normal file
View File

@ -0,0 +1,34 @@
From 99ee02fe20ae53323fe5756416e6a7d96a3baf8a Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 21 Jan 2016 10:39:21 +0100
Subject: [PATCH 1/3] ply-label: Don't crash if label plugin fails
The label plugin's create_control function can return NULL if allocation
failed, for example, but ply-label.c ignores that and uses the NULL control,
causing various SEGVs.
Signed-off-by: Fabian Vogt <fvogt@suse.com>
---
src/libply-splash-graphics/ply-label.c | 8 ++++++++
1 file changed, 8 insertions(+)
Index: plymouth-0.9.2/src/libply-splash-graphics/ply-label.c
===================================================================
--- plymouth-0.9.2.orig/src/libply-splash-graphics/ply-label.c
+++ plymouth-0.9.2/src/libply-splash-graphics/ply-label.c
@@ -130,6 +130,15 @@ ply_label_load_plugin (ply_label_t *labe
label->control = label->plugin_interface->create_control ();
+ if (label->control == NULL) {
+ ply_save_errno ();
+ label->plugin_interface = NULL;
+ ply_close_module (label->module_handle);
+ label->module_handle = NULL;
+ ply_restore_errno ();
+ return false;
+ }
+
if (label->text != NULL)
label->plugin_interface->set_text_for_control (label->control,
label->text);

6
plymouth.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 8 15:00:06 UTC 2016 - fvogt@suse.com
- Add 0003-fix_null_deref.patch as well
- Avoid potential SEGV if label plugin fails to load
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 20 13:14:31 UTC 2016 - fvogt@suse.com Wed Jan 20 13:14:31 UTC 2016 - fvogt@suse.com

2
plymouth.spec
View File

@ -53,6 +53,7 @@ Patch29: 0001-let-it-become-a-real-daemon.patch
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch fvogt@suse.com -- add ability to output text in initrd # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch fvogt@suse.com -- add ability to output text in initrd
Patch30: 0001-Add-label-ft-plugin.patch Patch30: 0001-Add-label-ft-plugin.patch
Patch31: 0002-Install-label-ft-plugin-into-initrd-if-available.patch Patch31: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
Patch32: 0003-fix_null_deref.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
@ -354,6 +355,7 @@ plugin.
%patch29 -p1 %patch29 -p1
%patch30 -p1 %patch30 -p1
%patch31 -p1 %patch31 -p1
%patch32 -p1
# replace builddate with patch0date # replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c