From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.io/gmane.comp.sysutils.supervision.general/2701
Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail
From: "Jacob Vosmaer via supervision" <supervision@list.skarnet.org>
Newsgroups: gmane.comp.sysutils.supervision.general
Subject: Handle ENOTDIR in pathexec_run
Date: Mon, 11 Nov 2019 18:00:21 +0100
Message-ID: <CADMWQoN4XCNAzm5weVd8kuBMMsZy+RP5KsFcBhAh1yqnmyjgRQ@mail.gmail.com>
Reply-To: Jacob Vosmaer <jacob@gitlab.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226";
	logging-data="206889"; mail-complaints-to="usenet@blaine.gmane.org"
To: supervision@list.skarnet.org
Original-X-From: supervision-return-2290-gcsg-supervision=m.gmane.org@list.skarnet.org Mon Nov 11 18:00:38 2019
Return-path: <supervision-return-2290-gcsg-supervision=m.gmane.org@list.skarnet.org>
Envelope-to: gcsg-supervision@m.gmane.org
Original-Received: from alyss.skarnet.org ([95.142.172.232])
	by blaine.gmane.org with smtp (Exim 4.89)
	(envelope-from <supervision-return-2290-gcsg-supervision=m.gmane.org@list.skarnet.org>)
	id 1iUD3M-000rYt-Uj
	for gcsg-supervision@m.gmane.org; Mon, 11 Nov 2019 18:00:37 +0100
Original-Received: (qmail 13045 invoked by uid 89); 11 Nov 2019 17:01:00 -0000
Mailing-List: contact supervision-help@list.skarnet.org; run by ezmlm
Original-Sender: <supervision@list.skarnet.org>
Precedence: bulk
List-Post: <mailto:supervision@list.skarnet.org>
List-Help: <mailto:supervision-help@list.skarnet.org>
List-Unsubscribe: <mailto:supervision-unsubscribe@list.skarnet.org>
List-Subscribe: <mailto:supervision-subscribe@list.skarnet.org>
List-Id: <supervision.list.skarnet.org>
Original-Received: (qmail 13038 invoked from network); 11 Nov 2019 17:00:59 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gitlab.com; s=google;
        h=mime-version:from:date:message-id:subject:to;
        bh=gccOrDoWtctxzyi9M9UmvrszmvsvE7YGDbelLtPZNV4=;
        b=McnfqgqsxsTopY2WuiK/S4FuLZZsTEcrX40Qacq4irD+4sXL8XzxxJog2Cf84DcQNc
         uA4UsUJYbpu3QeOtW5HRuuxzRET0m0D5DMoq/3uTjpliQb8mypaERXpb/cGH9LUbBeP3
         jR1fLrz3lP1zYVHvIGy1F/xIK9VkHG6s2+HU4=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
        bh=gccOrDoWtctxzyi9M9UmvrszmvsvE7YGDbelLtPZNV4=;
        b=MdAegEp2Tec+88d9AjbWgzHp4y693E/7CJjlf3xy5RVkzFfLuwcyEzKAeXw01puBlD
         6rcshYa34MI4Fv7niYF2ERyBkLlmIjz/5K6iIbURn9IJZrRF+qaEp/y4bedpc+nS5M3k
         gX0Rf5eYyYeY69DJJ4YQCkXqzIdwJ7dqMxiIv6Vxuk16y371oK0WKI9Gngsdpn+HcoV5
         pLzbFq6mlbo3a5OCA7b9YDqNzJVNgi/SglSY3n185r+L8Ah9J+l7N0gseBVBgjeUZ5aQ
         MirmMmJsWPJ2cM2XhUAHLDPBXrqrblOPhoBPgpt4oLs1mnEst/EP8QistCwgFMuvDk6M
         hiAg==
X-Gm-Message-State: APjAAAUceSMq/fyVZNQ6cb79fsIstmi+2A4s4Lf9rfeYmpED6TSo91+H
	w6lf75oFl9LzRbpImBIXjCxYIkWHsSsGuYYRv9MjaDEgtLjGpw==
X-Google-Smtp-Source: APXvYqyldyvP1MaZPQ0ZNOSf8rWoVsU+Mb8kFaBCEPZ3WyKaPp46F0StabOxl6nijK//lgqN5ypXLzZiO1FCwSbYTe8=
X-Received: by 2002:a05:6808:88:: with SMTP id s8mr13168396oic.109.1573491631830;
 Mon, 11 Nov 2019 09:00:31 -0800 (PST)
Xref: news.gmane.org gmane.comp.sysutils.supervision.general:2701
Archived-At: <http://permalink.gmane.org/gmane.comp.sysutils.supervision.general/2701>

Hello,

First time on this list. Long time fan of Runit.

We have recently run into an edge case in Runit, which I think might
be worth patching.

If a user starts up runsvdir with existing-but-not-directory garbage
in their PATH,
runsvdir ends up in a broken state with a cryptic error. This is how
you can reproduce it:

mkdir -p svcs/foo
cat >svcs/foo/run <<EOF
#!/bin/sh
echo hello world
while true; do
  sleep 1
done
EOF

chmod +x svcs/foo/run

PATH=/dev/null:$PATH runsvdir svcs

This will fail to launch runsv for svcs/foo. My understanding is this
happens because pathexec_run tries to call execve("/dev/null/runsv",
...) which fails with ENOTDIR.

Clearly this is a pathological PATH, but apparently there are people
out there who have this. And most other tools seem to ignore such
garbage entries. For example:

PATH=/dev/null:$PATH bash -c ls

The patch below makes runit ignore this type of bad path entry.

--- a/src/pathexec_run.c
+++ b/src/pathexec_run.c
@@ -35,7 +35,7 @@ void pathexec_run(const char *file,const char *
const *argv,const char * const *
     execve(tmp.s,argv,envp);
     if (errno != error_noent) {
       savederrno = errno;
-      if ((errno != error_acces) && (errno != error_perm) && (errno
!= error_isdir)) return;
+      if ((errno != error_acces) && (errno != error_perm) && (errno
!= error_isdir) && (errno != error_notdir)) return;
     }

     if (!path[split]) {

What do you think?

Best regards,

Jacob Vosmaer
GitLab, Inc.