Commit fc4177be authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds

exec: restore EACCES of S_ISDIR execve()

Patch series "Fix S_ISDIR execve() errno".

Fix an errno change for execve() of directories, noticed by Marc Zyngier.
Along with the fix, include a regression test to avoid seeing this return
in the future.

This patch (of 2):

The return code for attempting to execute a directory has always been
EACCES.  Adjust the S_ISDIR exec test to reflect the old errno instead of
the general EISDIR for other kinds of "open" attempts on directories.

Fixes: 633fb6ac ("exec: move S_ISREG() check earlier")
Reported-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Tested-by: default avatarGreg Kroah-Hartman <gregkh@android.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Link: http://lkml.kernel.org/r/20200813231723.2725102-2-keescook@chromium.org
Link: https://lore.kernel.org/lkml/20200813151305.6191993b@whySigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b1a3e75e
...@@ -2849,8 +2849,10 @@ static int may_open(const struct path *path, int acc_mode, int flag) ...@@ -2849,8 +2849,10 @@ static int may_open(const struct path *path, int acc_mode, int flag)
case S_IFLNK: case S_IFLNK:
return -ELOOP; return -ELOOP;
case S_IFDIR: case S_IFDIR:
if (acc_mode & (MAY_WRITE | MAY_EXEC)) if (acc_mode & MAY_WRITE)
return -EISDIR; return -EISDIR;
if (acc_mode & MAY_EXEC)
return -EACCES;
break; break;
case S_IFBLK: case S_IFBLK:
case S_IFCHR: case S_IFCHR:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment