[gentoo-commits] proj/linux-patches:4.13 commit in: /

[Mike Pagano]

commit:     73e439923a3fb2f4cf7bd1f1b05256019bddf7e5
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 00:23:13 2017 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 00:23:13 2017 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=73e43992

Fix for fbcondecor patch. Thanks to juneau_. See bug #629860

 4200_fbcondecor.patch | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/4200_fbcondecor.patch b/4200_fbcondecor.patch
index f7d9879..f853c51 100644
--- a/4200_fbcondecor.patch
+++ b/4200_fbcondecor.patch
@@ -1158,11 +1158,8 @@ index b87f5cf..ce44538 100644
        fbcon_has_exited = 1;
  }
  
-diff --git a/drivers/video/console/fbcondecor.c 
b/drivers/video/console/fbcondecor.c
-new file mode 100644
-index 0000000..65cc0d3
---- /dev/null
-+++ b/drivers/video/console/fbcondecor.c
+--- /dev/null  2017-09-04 17:08:58.496102115 -0400
++++ b/drivers/video/console/fbcondecor.c       2017-09-04 18:52:37.309402197 
-0400
 @@ -0,0 +1,549 @@
 +/*
 + *  linux/drivers/video/console/fbcondecor.c -- Framebuffer console 
decorations
@@ -1201,7 +1198,7 @@ index 0000000..65cc0d3
 +#include <linux/fs.h>
 +#include <linux/compat.h>
 +#include <linux/console.h>
-+
++#include <linux/binfmts.h>
 +#include <linux/uaccess.h>
 +#include <asm/irq.h>
 +
@@ -1336,7 +1333,7 @@ index 0000000..65cc0d3
 +          cfg->ty + cfg->theight > info->var.yres)
 +              return -EINVAL;
 +
-+      len = strlen_user(cfg->theme);
++      len = strnlen_user(cfg->theme, MAX_ARG_STRLEN);
 +      if (!len || len > FBCON_DECOR_THEME_LEN)
 +              return -EINVAL;
 +      tmp = kmalloc(len, GFP_KERNEL);