mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-03-06 12:58:22 +03:00
path: Skip directories when finalising $PATH search
Imagine $PATH /a:/b. There is an echo command at /b/echo. Under this configuration, this works fine: % systemd-run --user --scope echo . Running scope as unit: run-rfe98e0574b424d63a641644af511ff30.scope . However, if I do `mkdir /a/echo`, this happens: % systemd-run --user --scope echo . Running scope as unit: run-rcbe9369537ed47f282ee12ce9f692046.scope Failed to execute: Permission denied We check whether the resulting file is executable for the performing user, but of course, most directories are anyway, since that's needed to list within it. As such, another is_dir() check is needed prior to considering the search result final. Another approach might be to check S_ISREG, but there may be more gnarly edge cases there than just eliminating this obviously pathological example, so let's just do this for now. (cherry picked from commit 8b5cb69bc8b70d1dcc39ed2165907723099bd9d8) (cherry picked from commit b7cef386bd1bc810f5bb12d84c2ec4d6428231e3) (cherry picked from commit 0752452dc504be958c38af7d49ef5b729b28de5c) (cherry picked from commit d0735d81d406d51d320b190e522979200f5b3a8e)
This commit is contained in:
parent
c8033646de
commit
67d1efbc89
@ -640,6 +640,9 @@ int find_binary(const char *name, char **ret) {
|
||||
if (!j)
|
||||
return -ENOMEM;
|
||||
|
||||
if (is_dir(j, true))
|
||||
continue;
|
||||
|
||||
if (access(j, X_OK) >= 0) {
|
||||
/* Found it! */
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user