summaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-09-05 05:40:54 -0400
committerLinus Walleij <linus.walleij@linaro.org>2019-09-05 05:40:54 -0400
commit151a41014bff92f353263cadc051435dc9c3258e (patch)
treeaa082a0745edd5b7051668f455dfc0ee1e4a9de0 /fs/exec.c
parentae0755b56da9db4190288155ea884331993ed51b (diff)
parent089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff)
Merge tag 'v5.3-rc7' into devel
Linux 5.3-rc7
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exec.c b/fs/exec.c
index c71cbfe6826a..f7f6a140856a 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1828,7 +1828,7 @@ static int __do_execve_file(int fd, struct filename *filename,
1828 membarrier_execve(current); 1828 membarrier_execve(current);
1829 rseq_execve(current); 1829 rseq_execve(current);
1830 acct_update_integrals(current); 1830 acct_update_integrals(current);
1831 task_numa_free(current); 1831 task_numa_free(current, false);
1832 free_bprm(bprm); 1832 free_bprm(bprm);
1833 kfree(pathbuf); 1833 kfree(pathbuf);
1834 if (filename) 1834 if (filename)