Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01fceccc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.101 into android-4.14-p 



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

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 258c06c1 d6bf9dce

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 100

SUBLEVEL = 101

EXTRAVERSION =

NAME = Petit Gorille

fs/binfmt_script.c

+3 −7
Original line number Diff line number Diff line
@@ -42,14 +42,10 @@ static int load_script(struct linux_binprm *bprm) 
	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'))