From patchwork Thu Dec 5 07:33:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11274305 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DED83930 for ; Thu, 5 Dec 2019 07:33:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD42F206DB for ; Thu, 5 Dec 2019 07:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575531205; bh=edquYFBHaofPMU3DDDEksKNwbLIT1/Uva327KZiKnv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EUdVNDis5NnALeseBzFZlqatKSriZbZ5j18eOxBHMh13L3LiZ4F+liEzx4cZh8Dhs UeBxYkZeSgKMCcnhrnTwffnOmuwSnXCCLUOhD94WH/KaSa+oUHyxFq27BdSRYAGWKA IbKPzMS2ZOcyI9beC+4eKsiQzyMHGUOzWzRRvaqs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726589AbfLEHdZ (ORCPT ); Thu, 5 Dec 2019 02:33:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:34770 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726255AbfLEHdZ (ORCPT ); Thu, 5 Dec 2019 02:33:25 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C27AB206DB; Thu, 5 Dec 2019 07:33:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575531204; bh=edquYFBHaofPMU3DDDEksKNwbLIT1/Uva327KZiKnv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XjbV3N6MS6y+wZWwjqYf10xMmqJY+IW2ckjoi4h8dlvO/2LEPXhIZXNlw/7LHytGO EPwpu5uj1i8X52mn56mlMkBKBwvNzqBmKTktEgkC5tfviBxubtccc3xjtBrboW8/2x VY6QXjRx5MDxghbLts2s9hvhTEm13Sy+Flz4K778= From: Masami Hiramatsu To: Shuah Khan Cc: Micah Morton , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, jaswinder.singh@linaro.org Subject: [BUGFIX PATCH 1/2] selftests: safesetid: Move link library to LDLIBS Date: Thu, 5 Dec 2019 16:33:21 +0900 Message-Id: <157553120126.17524.14737256452305682171.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157553119188.17524.1379079312058580155.stgit@devnote2> References: <157553119188.17524.1379079312058580155.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Move -lcap to LDLIBS from CFLAGS because it is a library to be linked. Without this, safesetid failed to build with link error as below. ---- /usr/bin/ld: /tmp/ccL8rZHT.o: in function `drop_caps': safesetid-test.c:(.text+0xe7): undefined reference to `cap_get_proc' /usr/bin/ld: safesetid-test.c:(.text+0x107): undefined reference to `cap_set_flag' /usr/bin/ld: safesetid-test.c:(.text+0x10f): undefined reference to `cap_set_proc' /usr/bin/ld: safesetid-test.c:(.text+0x117): undefined reference to `cap_free' /usr/bin/ld: safesetid-test.c:(.text+0x136): undefined reference to `cap_clear' collect2: error: ld returned 1 exit status ---- Fixes: c67e8ec03f3f ("LSM: SafeSetID: add selftest") Signed-off-by: Masami Hiramatsu --- tools/testing/selftests/safesetid/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/safesetid/Makefile b/tools/testing/selftests/safesetid/Makefile index 98da7a504737..cac42cd36a1b 100644 --- a/tools/testing/selftests/safesetid/Makefile +++ b/tools/testing/selftests/safesetid/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for mount selftests. -CFLAGS = -Wall -lcap -O2 +CFLAGS = -Wall -O2 +LDLIBS = -lcap TEST_PROGS := run_tests.sh TEST_GEN_FILES := safesetid-test From patchwork Thu Dec 5 07:33:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11274307 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EED1B930 for ; Thu, 5 Dec 2019 07:33:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD3932464D for ; Thu, 5 Dec 2019 07:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575531215; bh=SBlr5dGydninkCDGtDUbXFFCG6ezPnNxiEjeRYEwuos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BqWf7JU39f9UymDxl3+/DuAitqyB2fRcaK4HwCGsfhGJkmSiN0DdGlqgHJSmwVzyI KGH9cAY8bqt5RAMnpGPqYrIav2evwMvankUy2Vd9WDK09+LedoFcm3ElFI+9JAMH/q xMwef0+gILpcWd+WCMRxp+ZxWFYWuvRe3giocwr8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726255AbfLEHdf (ORCPT ); Thu, 5 Dec 2019 02:33:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:34892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726177AbfLEHdf (ORCPT ); Thu, 5 Dec 2019 02:33:35 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C71A5206DB; Thu, 5 Dec 2019 07:33:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575531214; bh=SBlr5dGydninkCDGtDUbXFFCG6ezPnNxiEjeRYEwuos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Va/Ukuz+0YrrEfObgoolC1QzPARgKjmUxfrq65d5byh56/HUuqj4+PW4oqeBWBaGx Z8+kXmkCRVhj9HV1JAVnRF9Ttr9Xa3RJ3w53ZP8w01fbyunTPE7OE/2TqwOE+ZZrlR QmNvrFvRGQX/6FDuzVmkDkRuSRKp3zRq+9Q7nKE8= From: Masami Hiramatsu To: Shuah Khan Cc: Micah Morton , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, jaswinder.singh@linaro.org Subject: [BUGFIX PATCH 2/2] selftests: safesetid: Check the return value of setuid/setgid Date: Thu, 5 Dec 2019 16:33:30 +0900 Message-Id: <157553121008.17524.16085800798083225143.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157553119188.17524.1379079312058580155.stgit@devnote2> References: <157553119188.17524.1379079312058580155.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Check the return value of setuid() and setgid(). This fixes the following warnings and improves test result. safesetid-test.c: In function ‘main’: safesetid-test.c:294:2: warning: ignoring return value of ‘setuid’, declared with attribute warn_unused_result [-Wunused-result] setuid(NO_POLICY_USER); ^~~~~~~~~~~~~~~~~~~~~~ safesetid-test.c:295:2: warning: ignoring return value of ‘setgid’, declared with attribute warn_unused_result [-Wunused-result] setgid(NO_POLICY_USER); ^~~~~~~~~~~~~~~~~~~~~~ safesetid-test.c:309:2: warning: ignoring return value of ‘setuid’, declared with attribute warn_unused_result [-Wunused-result] setuid(RESTRICTED_PARENT); ^~~~~~~~~~~~~~~~~~~~~~~~~ safesetid-test.c:310:2: warning: ignoring return value of ‘setgid’, declared with attribute warn_unused_result [-Wunused-result] setgid(RESTRICTED_PARENT); ^~~~~~~~~~~~~~~~~~~~~~~~~ safesetid-test.c: In function ‘test_setuid’: safesetid-test.c:216:3: warning: ignoring return value of ‘setuid’, declared with attribute warn_unused_result [-Wunused-result] setuid(child_uid); ^~~~~~~~~~~~~~~~~ Fixes: c67e8ec03f3f ("LSM: SafeSetID: add selftest") Signed-off-by: Masami Hiramatsu --- tools/testing/selftests/safesetid/safesetid-test.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/safesetid/safesetid-test.c b/tools/testing/selftests/safesetid/safesetid-test.c index 8f40c6ecdad1..0c4d50644c13 100644 --- a/tools/testing/selftests/safesetid/safesetid-test.c +++ b/tools/testing/selftests/safesetid/safesetid-test.c @@ -213,7 +213,8 @@ static void test_setuid(uid_t child_uid, bool expect_success) } if (cpid == 0) { /* Code executed by child */ - setuid(child_uid); + if (setuid(child_uid) < 0) + exit(EXIT_FAILURE); if (getuid() == child_uid) exit(EXIT_SUCCESS); else @@ -291,8 +292,10 @@ int main(int argc, char **argv) // First test to make sure we can write userns mappings from a user // that doesn't have any restrictions (as long as it has CAP_SETUID); - setuid(NO_POLICY_USER); - setgid(NO_POLICY_USER); + if (setuid(NO_POLICY_USER) < 0) + die("Error with set uid(%d)\n", NO_POLICY_USER); + if (setgid(NO_POLICY_USER) < 0) + die("Error with set gid(%d)\n", NO_POLICY_USER); // Take away all but setid caps drop_caps(true); @@ -306,8 +309,10 @@ int main(int argc, char **argv) die("test_userns failed when it should work\n"); } - setuid(RESTRICTED_PARENT); - setgid(RESTRICTED_PARENT); + if (setuid(RESTRICTED_PARENT) < 0) + die("Error with set uid(%d)\n", RESTRICTED_PARENT); + if (setgid(RESTRICTED_PARENT) < 0) + die("Error with set gid(%d)\n", RESTRICTED_PARENT); test_setuid(ROOT_USER, false); test_setuid(ALLOWED_CHILD1, true);