ltp-cap.m4: add libcap version detection && fix compiler error
PATCH 1/1 ltp-cap.m4: add libcap version detection && fix compiler error
Current ltp-cap.m4 defines cap_libs when libcap has cap_compare function. This function was introduced by libcap-2. It is only used for the two places, and another places work fines with libcap-1. So add libcap version detection.
If you use the following function or macro, you must use libcap-2(HAVE_LIBCAP_V2):cap_comparecap_get_filecap_set_filecap_get_fdcap_set_fdCAP_LAST_CAP
This patch also fixes possible compiler error on old distros without PR_CAPBSET_READ/PR_CAPBSET_DROP flag, the following case:cap_bound/exec_with_inh.ccap_bound/exec_without_inh.cfilecaps/verify_caps_exec.c
--- m4/ltp-cap.m4 | 35 +++++++------------ testcases/kernel/containers/userns/userns01.c | 4 +-- testcases/kernel/containers/userns/userns06.c | 2 +- .../containers/userns/userns06_capcheck.c | 4 +-- .../kernel/security/cap_bound/cap_bounds_r.c | 2 +- .../kernel/security/cap_bound/cap_bounds_rw.c | 4 +-- .../security/cap_bound/cap_bset_inh_bounds.c | 4 +-- .../kernel/security/cap_bound/check_pe.c | 2 +- .../kernel/security/cap_bound/exec_with_inh.c | 9 +++-- .../security/cap_bound/exec_without_inh.c | 6 +++- .../security/filecaps/check_simple_capset.c | 2 +- .../kernel/security/filecaps/inh_capped.c | 4 +-- .../kernel/security/filecaps/print_caps.c | 2 +- .../security/filecaps/verify_caps_exec.c | 9 +++-- .../security/securebits/check_keepcaps.c | 2 +- .../kernel/syscalls/pivot_root/pivot_root01.c | 6 ++-- 16 files changed, 50 insertions(+), 47 deletions(-)
m4/ltp-cap.m4 +12 -23
@@ -1,37 +1,26 @@ -dnl +dnl SPDX-License-Identifier: GPL-2.0-or-later dnl Copyright (c) Cisco Systems Inc., 2009 dnl Copyright (c) Linux Test Project, 2010 -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -dnl the GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +dnl Copyright (c) Fujitsu, 2019 dnl dnl Author: Ngie Cooper <[email protected]> -dnl +dnl Author: Yang Xu <[email protected]> -dnl -dnl LTP_CHECK_CAPABILITY_SUPPORT -dnl ---------------------------- -dnl AC_DEFUN([LTP_CHECK_CAPABILITY_SUPPORT],[ -AH_TEMPLATE(HAVE_LIBCAP, +AH_TEMPLATE(HAVE_LIBCAP_V1, +[Define to 1 if you have libcap-1 installed.]) +AH_TEMPLATE(HAVE_LIBCAP_V2, [Define to 1 if you have libcap-2 installed.]) AC_CHECK_HEADERS([sys/capability.h],[capability_header_prefix="sys"]) if test "x$capability_header_prefix" != x; then - AC_CHECK_LIB(cap,cap_compare,[cap_libs="-lcap"]) + AC_CHECK_LIB(cap,cap_set_flag,[cap_libs="-lcap"]) + AC_CHECK_LIB(cap,cap_compare,[cap_version="2"]) fi if test "x$cap_libs" != x; then - AC_DEFINE(HAVE_LIBCAP) + AC_DEFINE(HAVE_LIBCAP_V1) +fi +if test "x$cap_version" != x; then + AC_DEFINE(HAVE_LIBCAP_V2) fi AC_SUBST(CAP_LIBS,$cap_libs) ])
testcases/kernel/containers/userns/userns01.c +2 -2
@@ -51,7 +51,7 @@ static int child_fn1(void *arg LTP_ATTRIBUTE_UNUSED) {int exit_val =0 ;int uid, gid; -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 cap_t caps;int i, last_cap;cap_flag_value_t flag_val;
@@ -67,7 +67,7 @@ static int child_fn1(void *arg LTP_ATTRIBUTE_UNUSED) exit_val =1 ; } -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 caps =cap_get_proc ();SAFE_FILE_SCANF (NULL ,"/proc/sys/kernel/cap_last_cap" ,"%d" , &last_cap);for (i =0 ; i <= last_cap; i++) {
testcases/kernel/containers/userns/userns06.c +1 -1
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])int fd;tst_parse_opts (argc, argv,NULL ,NULL ); -#ifndef HAVE_LIBCAP +#ifndef HAVE_LIBCAP_V1 tst_brkm (TCONF ,NULL ,"System is missing libcap." );#endif setup ();
testcases/kernel/containers/userns/userns06_capcheck.c +2 -2
@@ -39,7 +39,7 @@ int TST_TOTAL = 1;int main (int argc,char *argv[]) { -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 cap_t caps;int i, last_cap;cap_flag_value_t flag_val;
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])#endif tst_parse_opts (argc, argv,NULL ,NULL ); -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 if (strcmp ("privileged" , argv[1 ])) expected_flag =0 ;
testcases/kernel/security/cap_bound/cap_bounds_r.c +1 -1
@@ -41,7 +41,7 @@ int TST_TOTAL = 1;int main (void ) { -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V2 int ret =1 ;int i;int cap_last_cap =CAP_LAST_CAP ;
testcases/kernel/security/cap_bound/cap_bounds_rw.c +2 -2
@@ -63,7 +63,7 @@ int check_remaining_caps(int lastdropped)return i; } } -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V2 for (; i <= cap_last_cap; i++) {#if HAVE_DECL_PR_CAPBSET_READ ret =prctl (PR_CAPBSET_READ , i);
@@ -92,7 +92,7 @@ int main(void)int ret =1 ;int i; -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V2 cap_last_cap =CAP_LAST_CAP ;if (access (PROC_CAP_LAST ,R_OK ) ==0 ) {SAFE_FILE_SCANF (NULL ,PROC_CAP_LAST ,"%d" , &cap_last_cap);
testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c +2 -2
@@ -42,7 +42,7 @@ int main(int argc, char *argv[]) {#if HAVE_SYS_CAPABILITY_H #if HAVE_DECL_PR_CAPBSET_READ &&HAVE_DECL_PR_CAPBSET_DROP -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 int ret =1 ;cap_value_t v[1 ];cap_flag_value_t f;
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])tst_resm (TPASS ,"Couldn't put CAP_SYS_ADMIN back into pI when not in bounding set\n" ); -#else /* HAVE_LIBCAP */ +#else /* HAVE_LIBCAP_V1*/ tst_resm (TCONF ,"System doesn't have POSIX capabilities." );#endif #else /* HAVE_DECL_PR_CAPBSET_READ && HAVE_DECL_PR_CAPBSET_DROP */
testcases/kernel/security/cap_bound/check_pe.c +1 -1
@@ -42,7 +42,7 @@ int TST_TOTAL = 1;int main (int argc,char *argv[]) {#ifdef HAVE_SYS_CAPABILITY_H -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 int ret =1 ;cap_flag_value_t f;cap_t cur;
testcases/kernel/security/cap_bound/exec_with_inh.c +7 -2
@@ -41,7 +41,8 @@ int TST_TOTAL = 1;int main (int argc,char *argv[]) {#if HAVE_SYS_CAPABILITY_H -#ifdef HAVE_LIBCAP +#if HAVE_DECL_PR_CAPBSET_DROP +#ifdef HAVE_LIBCAP_V1 int ret =1 ;cap_flag_value_t f;cap_t cur =0 ;
@@ -81,9 +82,13 @@ int main(int argc, char *argv[])/* execute "check_pe 1" */ execl ("check_pe" ,"check_pe" ,"1" ,NULL );tst_resm (TBROK ,"Failed to execute check_pe (errno %d)\n" , errno); -#else /* HAVE_LIBCAP */ +#else /* HAVE_LIBCAP_V1 */ tst_resm (TCONF ,"System doesn't have POSIX capabilities." );#endif +#else /* HAVE_DECL_PR_CAPBSET_DROP */ +tst_resm (TCONF ,"System doesn't have CAPBSET prctls" ); +#endif +#else /* HAVE_SYS_CAPABILITY_H */ tst_resm (TCONF ,"System doesn't have sys/capability.h." );#endif
testcases/kernel/security/cap_bound/exec_without_inh.c +5 -1
@@ -41,7 +41,8 @@ int TST_TOTAL = 1;int main (int argc,char *argv[]) {#if HAVE_SYS_CAPABILITY_H -#ifdef HAVE_LIBCAP +#if HAVE_DECL_PR_CAPBSET_DROP +#ifdef HAVE_LIBCAP_V1 int ret =1 ;cap_flag_value_t f;cap_value_t v[1 ];
@@ -81,6 +82,9 @@ int main(int argc, char *argv[])#else /* libcap */ tst_resm (TCONF ,"System doesn't have POSIX capabilities." );#endif +#else /* HAVE_DECL_PR_CAPBSET_DROP */ +tst_resm (TCONF ,"System doesn't have CAPBSET prctls" ); +#endif #else /* capability_h */ tst_resm (TCONF ,"System doesn't have sys/capability.h." );#endif
testcases/kernel/security/filecaps/check_simple_capset.c +1 -1
@@ -27,7 +27,7 @@int main (void ) { -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V2 cap_t caps, caps2;int ret;
testcases/kernel/security/filecaps/inh_capped.c +2 -2
@@ -35,7 +35,7 @@char *TCID ="filecaps" ;int TST_TOTAL =1 ; -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 void debug_print_caps (char *when) {char buf[2000 ];
@@ -61,7 +61,7 @@ int set_caps_from_text(char *capstr)int main (void ) { -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 int ret;debug_print_caps ("start" );
testcases/kernel/security/filecaps/print_caps.c +1 -1
@@ -41,7 +41,7 @@int main (int argc,char *argv[]) { -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 cap_t cap =cap_get_proc ();int fd;int seqno =0 ;
testcases/kernel/security/filecaps/verify_caps_exec.c +7 -2
@@ -62,7 +62,7 @@ static void usage(const char *me)#define DROP_PERMS 0#define KEEP_PERMS 1 -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V2 static void print_my_caps (void ) {cap_t cap =cap_get_proc ();
@@ -226,11 +226,16 @@ static int caps_actually_set_test(void)int num_caps;for (num_caps =0 ;; num_caps++) { +#if HAVE_DECL_PR_CAPBSET_READ ret =prctl (PR_CAPBSET_READ , num_caps);/* * Break from the loop in this manner to avoid incrementing, * then having to decrement value. */ +#else +tst_resm (TCONF ,"System doesn't have CAPBSET prctls" ); + ret =-1 ; +#endif if (ret ==-1 )break ; }
@@ -393,7 +398,7 @@ static int caps_actually_set_test(void)int main (int argc,char *argv[]) { -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V2 if (argc <2 )usage (argv[0 ]);
testcases/kernel/security/securebits/check_keepcaps.c +1 -1
@@ -28,7 +28,7 @@char *TCID ="keepcaps" ;int TST_TOTAL =1 ; -#if (HAVE_LINUX_SECUREBITS_H &&HAVE_LIBCAP ) +#if (HAVE_LINUX_SECUREBITS_H &&HAVE_LIBCAP_V1 )#include <linux/securebits.h> static int eff_caps_empty (cap_t c)
testcases/kernel/syscalls/pivot_root/pivot_root01.c +3 -3
@@ -18,7 +18,7 @@#ifdef HAVE_UNSHARE -#ifdef HAVE_LIBCAP +#ifdef HAVE_SYS_CAPABILITY_H #include <sys/capability.h> #endif
@@ -74,7 +74,7 @@ static const struct test_case { {NO_CAP_SYS_ADMIN, EPERM}, }; -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 static void drop_cap_sys_admin(void) { cap_value_t cap_value[] = { CAP_SYS_ADMIN };
@@ -140,7 +140,7 @@ static void run(unsigned int test_case) }if (test_cases[test_case].test_case ==NO_CAP_SYS_ADMIN ) { -#ifdef HAVE_LIBCAP +#ifdef HAVE_LIBCAP_V1 drop_cap_sys_admin ();#else tst_res(TCONF,
Signature · 1 line
2.18.1
PATCH 1/1 ltp-cap.m4: add libcap version detection && fix compiler error
Hi Yang,
Quoted 5 lines
Current ltp-cap.m4 defines
cap_libswhen libcap hascap_comparefunction. This function was introduced by libcap-2. It is only used for the two places, and another places work fines with libcap-1. So add libcap version detection.
Can't we just fix these possible compiler errors for old distros and require libcap v2? TCONF for very old distros looks OK for me. libcap-2.00 was released 12 years ago (2007), these distros does not have it:
SLES 10 SP3 [1], RHEL-4.8 [2], Debian 4.0 [3]. Do we really want to care about these old distros (it looks like only RHEL is supported)?
We also dropped libnuma v1 support (in 2c98cbbaf), v2 was released at similar date (2008).
Kind regards,
Petr
[1] https://distrowatch.com/table.php?distribution=sle&pkglist=true&version=10-sp3#pkglist
[2] https://distrowatch.com/table.php?distribution=redhat&pkglist=true&version=rhel-4.8#pkglist
[3] https://distrowatch.com/table.php?distribution=debian&pkglist=true&version=4.0#pkglist
PATCH 1/1 ltp-cap.m4: add libcap version detection && fix compiler error
Quoted 8 lines · Petr Vorel
Hi Yang,
Quoted 5 lines
Current ltp-cap.m4 defines
cap_libswhen libcap hascap_comparefunction. This function was introduced by libcap-2. It is only used for the two places, and another places work fines with libcap-1. So add libcap version detection.
Quoted 7 lines
Can't we just fix these possible compiler errors for old distros and require libcap v2? TCONF for very old distros looks OK for me. libcap-2.00 was released 12 years ago (2007), these distros does not have it:
SLES 10 SP3 [1], RHEL-4.8 [2], Debian 4.0 [3]. Do we really want to care about these old distros (it looks like only RHEL is supported)?
We also dropped libnuma v1 support (in2c98cbbaf), v2 was released at similar date (2008).
Hi Peter
I sent a mail to you last Friday mentioned this problem. At the beginning, I think it makes no sense because libcap-1 is too old. But I notices that ltp-quota.m4 has quota_v1 and quota_v2. I changes my mind.
Since we have drop libnuma v1, I agree with you that we also drop libcap v1(too old). Also, I think we should drop quota_v1 because it is too old (since Linux 2.4.22, Q_GETINFO has been supported in kernel).
Kind Regards,
Yang Xu
Quoted 8 lines
Kind regards,
Petr[1] https://distrowatch.com/table.php?distribution=sle&pkglist=true&version=10-sp3#pkglist
[2] https://distrowatch.com/table.php?distribution=redhat&pkglist=true&version=rhel-4.8#pkglist
[3] https://distrowatch.com/table.php?distribution=debian&pkglist=true&version=4.0#pkglist
PATCH 1/1 ltp-cap.m4: add libcap version detection && fix compiler error
Hi Yang,
Quoted 3 lines
Hi Peter
I sent a mail to you last Friday mentioned this problem.
Noticed, before I find a time you send a patch, so I replied to it (it's always better to send a question in public).
Quoted 7 lines
At the beginning, I
think it makes no sense because libcap-1 is too old. But I notices that ltp-quota.m4 hasquota_v1andquota_v2. I changes my mind.Since we have drop libnuma v1, I agree with you that we also drop libcap v1(too old). Also, I think we should drop
quota_v1because it is too old (since Linux 2.4.22,Q_GETINFOhas been supported in kernel).
Good point. But I'm not sure if it's the same, as QFMT_VFS_OLD is part of kernel source tree (part of kernel space code) so it makes sense to test it, whereas libcap v1 and libnuma v1 are just old versions of user space library. Or am I wrong?
Quoted 2 lines
Kind Regards,
Yang Xu
Kind regards,
Petr
PATCH 1/1 ltp-cap.m4: add libcap version detection && fix compiler error
Quoted 7 lines · Petr Vorel
Hi Yang,
Quoted 2 lines
Hi Peter
I sent a mail to you last Friday mentioned this problem.Noticed, before I find a time you send a patch, so I replied to it (it's always better to send a question in public).
OK. I got it.
Quoted 10 lines
Quoted 6 lines
At the beginning, I
think it makes no sense because libcap-1 is too old. But I notices that ltp-quota.m4 hasquota_v1andquota_v2. I changes my mind.
Since we have drop libnuma v1, I agree with you that we also drop libcap v1(too old). Also, I think we should dropquota_v1because it is too old (since Linux 2.4.22,Q_GETINFOhas been supported in kernel).Good point. But I'm not sure if it's the same, as
QFMT_VFS_OLDis part of kernel source tree (part of kernel space code) so it makes sense to test it, whereas libcap v1 and libnuma v1 are just old versions of user space library. Or am I wrong?
Hi Petr
I have seen kernel source about quota and try it. I think you are right. But current quota_v1
and quota_v2 detection has problem. In kernel source, I disable CONFIG_QFMT_V2 and enable CONFIG_QFMT_V1 ,then I found ltp still detects quotav2 instead of quotav1, and run ./quotactl01, the following error occurs:
./quotactl01
tst_device.c:84: INFO: Found free device '/dev/loop0'
tst_mkfs.c:90: INFO: Formatting /dev/loop0 with ext4 opts='' extra opts='' mke2fs 1.44.4 (18-Aug-2018)
tst_test.c:1096: INFO: Timeout per run is 0h 05m 00s
quotactl01.c:195: FAIL: quotactl failed to turn on quota for user: ESRCH quotactl01.c:195: FAIL: quotactl failed to set disk quota limit for user: ESRCH quotactl01.c:195: FAIL: quotactl failed to get disk quota limit for user: ESRCH quotactl01.c:195: FAIL: quotactl failed to set information about quotafile for user: ESRCH quotactl01.c:195: FAIL: quotactl failed to get information about quotafile for user: ESRCH quotactl01.c:195: FAIL: quotactl failed to get quota format for user: ESRCH quotactl01.c:206: PASS: quotactl succeeded to update quota usages for user quotactl01.c:206: PASS: quotactl succeeded to turn off quota for user quotactl01.c:195: FAIL: quotactl failed to turn on quota for group: ESRCH quotactl01.c:195: FAIL: quotactl failed to set disk quota limit for group: ESRCH quotactl01.c:195: FAIL: quotactl failed to set disk quota limit for group: ESRCH quotactl01.c:195: FAIL: quotactl failed to set information about quotafile for group: ESRCH quotactl01.c:195: FAIL: quotactl failed to get information about quotafile for group: ESRCH quotactl01.c:195: FAIL: quotactl failed to get quota format for group: ESRCH quotactl01.c:206: PASS: quotactl succeeded to update quota usages for group quotactl01.c:206: PASS: quotactl succeeded to turn off quota for group
Summary:
passed 4 failed 12 skipped 0
warnings 0
Kind Regards,
Yang Xu
Quoted 7 lines
Quoted 2 lines
Kind Regards,
Yang XuKind regards,
Petr
PATCH 1/1 ltp-cap.m4: add libcap version detection && fix compiler error
Hi Yang,
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines
At the beginning, I
think it makes no sense because libcap-1 is too old. But I notices that ltp-quota.m4 hasquota_v1andquota_v2. I changes my mind.
Since we have drop libnuma v1, I agree with you that we also drop libcap v1(too old). Also, I think we should dropquota_v1because it is too old (since Linux 2.4.22,Q_GETINFOhas been supported in kernel).Good point. But I'm not sure if it's the same, as
QFMT_VFS_OLDis part of kernel source tree (part of kernel space code) so it makes sense to test it, whereas libcap v1 and libnuma v1 are just old versions of user space library. Or am I wrong?
Quoted 5 lines
Hi Petr
I have seen kernel source about quota and try it. I think you are right. But current
quota_v1
andquota_v2detection has problem. In kernel source, I disableCONFIG_QFMT_V2and enableCONFIG_QFMT_V1,then I found ltp still detects quotav2 instead of quotav1, and run ./quotactl01, the following error occurs:
LTP detection in ltp-quota.m4 defines _LINUX_QUOTA_VERSION for detection. I guess you'd have to define HAVE_QUOTAV1 and undefine HAVE_QUOTAV2 in in include/config.h, but not tested.
BTW _LINUX_QUOTA_VERSION was removed from glibc in 2.25 [1] [2], which based setup on <linux/quota.h>. And musl defines only _LINUX_QUOTA_VERSION 2.
Regards man info that v1 is from kernel v2.4.22 we should probably also remove it's support.
We got a bit away from libcap :).
Kind regards,
Petr
[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=4d728087ef8cc826b05bd21d0c74d4eca9b1a27d;hp=de6b6d14e9b4d8e9a7333addca55163d9ebb7ff6
[2] https://patchwork.ozlabs.org/patch/664156/
PATCH 1/1 ltp-cap.m4: add libcap version detection && fix compiler error
Hi Petr
Quoted 20 lines
Hi Yang,
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
At the beginning, I
think it makes no sense because libcap-1 is too old. But I notices that ltp-quota.m4 hasquota_v1andquota_v2. I changes my mind.
Since we have drop libnuma v1, I agree with you that we also drop libcap v1(too old). Also, I think we should dropquota_v1because it is too old (since Linux 2.4.22,Q_GETINFOhas been supported in kernel).Quoted 8 lines
Quoted 4 lines
Good point. But I'm not sure if it's the same, as
QFMT_VFS_OLDis part of kernel source tree (part of kernel space code) so it makes sense to test it, whereas libcap v1 and libnuma v1 are just old versions of user space library. Or am I wrong?Hi Petr
I have seen kernel source about quota and try it. I think you are right. But currentquota_v1
andquota_v2detection has problem. In kernel source, I disableCONFIG_QFMT_V2and enableCONFIG_QFMT_V1,then I found ltp still detects quotav2 instead of quotav1, and run ./quotactl01, the following error occurs:LTP detection in ltp-quota.m4 defines
_LINUX_QUOTA_VERSIONfor detection. I guess you'd have to defineHAVE_QUOTAV1and undefineHAVE_QUOTAV2in ininclude/config.h, but not tested.
Quoted 5 lines
BTW
_LINUX_QUOTA_VERSIONwas removed from glibc in 2.25 [1] [2], which based setup on<linux/quota.h>. And musl defines only_LINUX_QUOTA_VERSION2.Regards man info that v1 is from kernel v2.4.22 we should probably also remove it's support.
Thanks for your reply.
Quoted 1 line
We got a bit away from libcap :).
:-) let's go back to libcap. I will send a v2 patch to only fix possible compiler error.
PATCH v2 1/1 security: add missing PR_CAPBSET_READ/PR_CAPBSET_DROP check
In reply to Petr VorelPR_CAPBSET_READ/PR_CAPNSET_DROP was added since linux2.6.25, current ltp detected them in ltp-prctl.m4, but three places missed this check. So add it, fix possible compiler error on some old dirtros without PR_CAPBSET_READ/PR_CAPNSET_DROP flag.
--- testcases/kernel/security/cap_bound/exec_with_inh.c | 4 ++++ testcases/kernel/security/cap_bound/exec_without_inh.c | 4 ++++ testcases/kernel/security/filecaps/verify_caps_exec.c | 5 +++++ 3 files changed, 13 insertions(+)
testcases/kernel/security/cap_bound/exec_with_inh.c +4 -0
@@ -41,6 +41,7 @@ int TST_TOTAL = 1;int main (int argc,char *argv[]) {#if HAVE_SYS_CAPABILITY_H +#if HAVE_DECL_PR_CAPBSET_DROP #ifdef HAVE_LIBCAP int ret =1 ;cap_flag_value_t f;
@@ -84,6 +85,9 @@ int main(int argc, char *argv[])#else /* HAVE_LIBCAP */ tst_resm (TCONF ,"System doesn't have POSIX capabilities." );#endif +#else /* HAVE_DECL_PR_CAPBSET_DROP*/ +tst_resm (TCONF ,"System doesn't have CAPBSET prctls" ); +#endif #else /* HAVE_SYS_CAPABILITY_H */ tst_resm (TCONF ,"System doesn't have sys/capability.h." );#endif
testcases/kernel/security/cap_bound/exec_without_inh.c +4 -0
@@ -41,6 +41,7 @@ int TST_TOTAL = 1;int main (int argc,char *argv[]) {#if HAVE_SYS_CAPABILITY_H +#if HAVE_DECL_PR_CAPBSET_DROP #ifdef HAVE_LIBCAP int ret =1 ;cap_flag_value_t f;
@@ -81,6 +82,9 @@ int main(int argc, char *argv[])#else /* libcap */ tst_resm (TCONF ,"System doesn't have POSIX capabilities." );#endif +#else /* HAVE_DECL_PR_CAPBSET_DROP */ +tst_resm (TCONF ,"System doesn't have CAPBSET prctls" ); +#endif #else /* capability_h */ tst_resm (TCONF ,"System doesn't have sys/capability.h." );#endif
testcases/kernel/security/filecaps/verify_caps_exec.c +5 -0
@@ -226,7 +226,12 @@ static int caps_actually_set_test(void)int num_caps;for (num_caps =0 ;; num_caps++) { +#if HAVE_DECL_PR_CAPBSET_READ ret =prctl (PR_CAPBSET_READ , num_caps); +#else +tst_resm (TCONF ,"System doesn't have CAPBSET prctls" ); + ret =-1 ; +#endif /* * Break from the loop in this manner to avoid incrementing, * then having to decrement value.
Signature · 1 line
2.18.1
PATCH v2 1/1 security: add missing PR_CAPBSET_READ/PR_CAPBSET_DROP check
Hi Yang,
Quoted 4 lines
PR_CAPBSET_READ/PR_CAPNSET_DROP was added since linux2.6.25, current ltp detected them in ltp-prctl.m4, but three places missed this check. So add it, fix possible compiler error on some old dirtros without PR_CAPBSET_READ/PR_CAPNSET_DROP flag.
Thanks for your patch, merged.
BTW these cap files would deserve converting into new API.
Kind regards,
Petr
PATCH v2 1/1 security: add missing PR_CAPBSET_READ/PR_CAPBSET_DROP check
Quoted 10 lines
Hi Yang,
Quoted 4 lines
PR_CAPBSET_READ/PR_CAPNSET_DROP was added since linux2.6.25, current ltp detected them in ltp-prctl.m4, but three places missed this check. So add it, fix possible compiler error on some old dirtros without PR_CAPBSET_READ/PR_CAPNSET_DROP flag.
Thanks for your patch, merged.
BTW these cap files would deserve converting into new API.
Hi Petr
Ok. I will take this as the next plan.
Quoted 5 lines
Kind regards,
Petr