commit 4a739e3530cc4561cfe78f270d4c19c4b31b85dc
author Greg Kroah-Hartman <gregkh@google.com> Fri Feb 15 10:12:14 2019 +0100
committer Greg Kroah-Hartman <gregkh@google.com> Fri Feb 15 10:12:14 2019 +0100
tree 00c85cb4c78094e18d10f08a7f5fd5f1f23a0734
parent 4dd44f441deca2bde8a1576769354a4e1cfc3ea8
parent d6bf9dcebdd11967b2b6c73d7c8f4863624f69c7

Merge 4.14.101 into android-4.14

Changes in 4.14.101
	Revert "exec: load_script: don't blindly truncate shebang string"
	Linux 4.14.101

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Makefile

diff --git a/Makefile b/Makefile
index d666899..eddd513 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 100
+SUBLEVEL = 101
 EXTRAVERSION =
 NAME = Petit Gorille
 

fs/binfmt_script.c

diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
index d0078cb..7cde3f46 100644
--- a/fs/binfmt_script.c
+++ b/fs/binfmt_script.c
@@ -42,14 +42,10 @@
 	fput(bprm->file);
 	bprm->file = NULL;
 
-	for (cp = bprm->buf+2;; cp++) {
-		if (cp >= bprm->buf + BINPRM_BUF_SIZE)
-			return -ENOEXEC;
-		if (!*cp || (*cp == '\n'))
-			break;
-	}
+	bprm->buf[BINPRM_BUF_SIZE - 1] = '\0';
+	if ((cp = strchr(bprm->buf, '\n')) == NULL)
+		cp = bprm->buf+BINPRM_BUF_SIZE-1;
 	*cp = '\0';
-
 	while (cp > bprm->buf) {
 		cp--;
 		if ((*cp == ' ') || (*cp == '\t'))