From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] open|creat: skip S_ISGID check on files created by non-group members
Date: Mon, 30 Jul 2018 13:57:15 +0200 [thread overview]
Message-ID: <20180730115715.GA14198@rei> (raw)
In-Reply-To: <3d0dd8e851d8db6bae222ca5946419b75df35ba5.1531816427.git.jstancek@redhat.com>
Hi!
> 0fa3ecd87848 ("Fix up non-directory creation in SGID directories")
> fixes problem described in CVE-2018-13405. This commit is getting
> backported to older streams as well.
>
> This patch removes S_ISGID check for files created by non-group members
> in LTP tests creat08 and open10.
Looks good, acked.
> Once 0fa3ecd87848 will be in non-rc kernel, we could add a new test
> for this CVE that would be limited to 4.18+ kernels.
Given that this is CVE we may as well go a little bit further and write
a test that will fail even on older kernels.
> Signed-off-by: Jan Stancek <jstancek@redhat.com>
> ---
> testcases/kernel/syscalls/creat/creat08.c | 13 ++++++-------
> testcases/kernel/syscalls/open/open10.c | 12 +++++-------
> 2 files changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/creat/creat08.c b/testcases/kernel/syscalls/creat/creat08.c
> index 50f2b39931b8..d22558ac3c53 100644
> --- a/testcases/kernel/syscalls/creat/creat08.c
> +++ b/testcases/kernel/syscalls/creat/creat08.c
> @@ -361,13 +361,12 @@ int main(int ac, char **av)
> local_flag = FAILED;
> }
>
> - /* Verify modes */
> - if (!(buf.st_mode & S_ISGID)) {
> - tst_resm(TFAIL,
> - "%s: Incorrect modes, setgid bit should be set",
> - setgid_B);
> - local_flag = FAILED;
> - }
> + /*
> + * Skip S_ISGID check
> + * 0fa3ecd87848 ("Fix up non-directory creation in SGID directories")
> + * clears S_ISGID for files created by non-group members
> + */
> +
> close(fd);
>
> if (local_flag == PASSED) {
> diff --git a/testcases/kernel/syscalls/open/open10.c b/testcases/kernel/syscalls/open/open10.c
> index 613f2288fbde..14feec9e127e 100644
> --- a/testcases/kernel/syscalls/open/open10.c
> +++ b/testcases/kernel/syscalls/open/open10.c
> @@ -345,13 +345,11 @@ int main(int ac, char *av[])
> local_flag = FAILED;
> }
>
> - /* Verify modes */
> - if (!(buf.st_mode & S_ISGID)) {
> - tst_resm(TFAIL,
> - "%s: Incorrect modes, setgid bit not set",
> - setgid_B);
> - local_flag = FAILED;
> - }
> + /*
> + * Skip S_ISGID check
> + * 0fa3ecd87848 ("Fix up non-directory creation in SGID directories")
> + * clears S_ISGID for files created by non-group members
> + */
>
> if (local_flag == PASSED) {
> tst_resm(TPASS, "Test passed in block2.");
> --
> 1.8.3.1
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
--
Cyril Hrubis
chrubis@suse.cz
next prev parent reply other threads:[~2018-07-30 11:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-17 8:35 [LTP] [PATCH] open|creat: skip S_ISGID check on files created by non-group members Jan Stancek
2018-07-18 15:04 ` Naresh Kamboju
2018-07-30 11:57 ` Cyril Hrubis [this message]
2018-07-30 12:27 ` Jan Stancek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180730115715.GA14198@rei \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox