Magellan Linux

Annotation of /trunk/kernel-alx/patches-4.19/0122-4.19.23-all-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 3401 - (hide annotations) (download)
Fri Aug 2 11:47:34 2019 UTC (4 years, 9 months ago) by niro
File size: 870 byte(s)
-linux-4.19.23
1 niro 3401 diff --git a/Makefile b/Makefile
2     index 8cfcb01fcd7b..3dcf3f2363c1 100644
3     --- a/Makefile
4     +++ b/Makefile
5     @@ -1,7 +1,7 @@
6     # SPDX-License-Identifier: GPL-2.0
7     VERSION = 4
8     PATCHLEVEL = 19
9     -SUBLEVEL = 22
10     +SUBLEVEL = 23
11     EXTRAVERSION =
12     NAME = "People's Front"
13    
14     diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
15     index d0078cbb718b..7cde3f46ad26 100644
16     --- a/fs/binfmt_script.c
17     +++ b/fs/binfmt_script.c
18     @@ -42,14 +42,10 @@ static int load_script(struct linux_binprm *bprm)
19     fput(bprm->file);
20     bprm->file = NULL;
21    
22     - for (cp = bprm->buf+2;; cp++) {
23     - if (cp >= bprm->buf + BINPRM_BUF_SIZE)
24     - return -ENOEXEC;
25     - if (!*cp || (*cp == '\n'))
26     - break;
27     - }
28     + bprm->buf[BINPRM_BUF_SIZE - 1] = '\0';
29     + if ((cp = strchr(bprm->buf, '\n')) == NULL)
30     + cp = bprm->buf+BINPRM_BUF_SIZE-1;
31     *cp = '\0';
32     -
33     while (cp > bprm->buf) {
34     cp--;
35     if ((*cp == ' ') || (*cp == '\t'))