Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-07-06 07:04:05 +0200
committerKernel Build Daemon <kbuild@suse.de>2018-07-06 07:04:05 +0200
commit4933ef5de53b19c8b45b79381c4517f31f949d7e (patch)
tree4ccb242c4440ca628fe4f954ce15dac08acc52b1
parent9da9d2e468d0707b0a84d05af9689c47c9c2aefe (diff)
parentf6ee1e75a5bf973c7f94cd7bc7e78c8bb55e3116 (diff)
Merge branch 'SLE12-SP3' into openSUSE-42.3
-rw-r--r--patches.fixes/0001-video-fbdev-stifb-Return-ENOMEM-after-a-failed-kzall.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.fixes/0001-video-fbdev-stifb-Return-ENOMEM-after-a-failed-kzall.patch b/patches.fixes/0001-video-fbdev-stifb-Return-ENOMEM-after-a-failed-kzall.patch
new file mode 100644
index 0000000000..3e3661df1b
--- /dev/null
+++ b/patches.fixes/0001-video-fbdev-stifb-Return-ENOMEM-after-a-failed-kzall.patch
@@ -0,0 +1,39 @@
+From f9815f945aff2204b8afbbb9d2182024eb44a194 Mon Sep 17 00:00:00 2001
+From: Markus Elfring <elfring@users.sourceforge.net>
+Date: Wed, 28 Mar 2018 16:34:27 +0200
+Subject: [PATCH] video/fbdev/stifb: Return -ENOMEM after a failed kzalloc() in
+ stifb_init_fb()
+Git-commit: f9815f945aff2204b8afbbb9d2182024eb44a194
+Patch-mainline: v4.17
+References: bsc#1090888 bsc#1099966
+
+Replace an error code for the indication of a memory allocation failure
+in this function.
+
+Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2: Initial git repository build")
+Suggested-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
+Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
+Cc: Helge Deller <deller@gmx.de>
+Cc: "James E. J. Bottomley" <jejb@parisc-linux.org>
+Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/video/fbdev/stifb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c
+index 6ded5c198998..511a594889af 100644
+--- a/drivers/video/fbdev/stifb.c
++++ b/drivers/video/fbdev/stifb.c
+@@ -1128,7 +1128,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
+ fb = kzalloc(sizeof(*fb), GFP_ATOMIC);
+ if (!fb) {
+ printk(KERN_ERR "stifb: Could not allocate stifb structure\n");
+- return -ENODEV;
++ return -ENOMEM;
+ }
+
+ info = &fb->info;
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 827898762f..637c086e4b 100644
--- a/series.conf
+++ b/series.conf
@@ -10768,6 +10768,7 @@
patches.drivers/drm-nouveau-gr-fallback-to-legacy-paths-during-firmw
patches.drivers/0001-drm-radeon-Avoid-double-gpu-reset-by-adding-a-timeou.patch
+ patches.fixes/0001-video-fbdev-stifb-Return-ENOMEM-after-a-failed-kzall.patch
########################################################
# video4linux