← Commit list

6885d4c31

Denys Vlasenko
Denys Vlasenko
2026-08-31
SUCCESS Duration: 153s

Subject

*: selinux: replace deprecated security_context_t with char*

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

coreutils/id.c +1 -1coreutils/install.c +2 -2coreutils/libcoreutils/getopt_mk_fifo_nod.c +1 -1coreutils/ls.c +1 -1coreutils/mkdir.c +1 -1coreutils/stat.c +6 -6findutils/find.c +2 -2include/libbb.h +3 -3libbb/copy_file.c +3 -3libbb/run_shell.c +2 -2libbb/selinux_common.c +3 -3libbb/update_passwd.c +1 -1loginutils/login.c +3 -3selinux/chcon.c +2 -2selinux/matchpathcon.c +1 -1selinux/runcon.c +2 -2selinux/sestatus.c +1 -1util-linux/mkswap.c +2 -2
coreutils/id.c+1 -1
@@ -156,7 +156,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
const char *prefix;
const char *username;
#if ENABLE_SELINUX
- security_context_t scontext = NULL;
+ char *scontext = NULL;
#endif
if (ENABLE_GROUPS && (!ENABLE_ID || applet_name[0] == 'g')) {
coreutils/install.c+2 -2
@@ -73,7 +73,7 @@ static const char install_longopts[] ALIGN1 =
static void setdefaultfilecon(const char *path)
{
struct stat s;
- security_context_t scontext = NULL;
+ char *scontext = NULL;
if (!is_selinux_enabled()) {
return;
@@ -119,7 +119,7 @@ int install_main(int argc, char **argv)
int ret = EXIT_SUCCESS;
int isdir;
#if ENABLE_SELINUX
- security_context_t scontext;
+ char *scontext;
bool use_default_selinux_context = 1;
#endif
enum {
coreutils/libcoreutils/getopt_mk_fifo_nod.c+1 -1
@@ -26,7 +26,7 @@ mode_t FAST_FUNC getopt_mk_fifo_nod(char **argv)
mode_t mode = 0666;
char *smode = NULL;
#if ENABLE_SELINUX
- security_context_t scontext;
+ char *scontext;
#endif
int opt;
opt = getopt32(argv, "m:" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
coreutils/ls.c+1 -1
@@ -311,7 +311,7 @@ struct dnode {
const char *name; /* usually basename, but think "ls -l dir/file" */
const char *fullname; /* full name (usable for stat etc) */
struct dnode *dn_next; /* for linked list */
- IF_SELINUX(security_context_t sid;)
+ IF_SELINUX(char *sid;)
smallint fname_allocated;
/* Used to avoid re-doing [l]stat at printout stage
coreutils/mkdir.c+1 -1
@@ -57,7 +57,7 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
unsigned opt;
char *smode;
#if ENABLE_SELINUX
- security_context_t scontext;
+ char *scontext;
#endif
opt = getopt32long(argv, "m:pv" IF_SELINUX("Z:"),
coreutils/stat.c+6 -6
@@ -298,7 +298,7 @@ static void printf_time_t(char *pformat, time_t val)
/* print statfs info */
static void FAST_FUNC print_statfs(char *pformat, const char m,
const char *const filename, const void *data
- IF_SELINUX(, security_context_t scontext))
+ IF_SELINUX(, char *scontext))
{
const struct statfs *statfsbuf = data;
if (m == 'n') {
@@ -337,7 +337,7 @@ static void FAST_FUNC print_statfs(char *pformat, const char m,
/* print stat info */
static void FAST_FUNC print_stat(char *pformat, const char m,
const char *const filename, const void *data
- IF_SELINUX(, security_context_t scontext))
+ IF_SELINUX(, char *scontext))
{
struct stat *statbuf = (struct stat *) data;
struct passwd *pw_ent;
@@ -420,9 +420,9 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
static void print_it(const char *masterformat,
const char *filename,
- void FAST_FUNC (*print_func)(char*, char, const char*, const void* IF_SELINUX(, security_context_t scontext)),
+ void FAST_FUNC (*print_func)(char*, char, const char*, const void* IF_SELINUX(, char *scontext)),
const void *data
- IF_SELINUX(, security_context_t scontext))
+ IF_SELINUX(, char *scontext))
{
/* Create a working copy of the format string */
char *format = xstrdup(masterformat);
@@ -487,7 +487,7 @@ static bool do_statfs(const char *filename, const char *format)
const char *format;
#endif
#if ENABLE_SELINUX
- security_context_t scontext = NULL;
+ char *scontext = NULL;
if (option_mask32 & OPT_SELINUX) {
if ((option_mask32 & OPT_DEREFERENCE
@@ -602,7 +602,7 @@ static bool do_stat(const char *filename, const char *format)
{
struct stat statbuf;
#if ENABLE_SELINUX
- security_context_t scontext = NULL;
+ char *scontext = NULL;
if (option_mask32 & OPT_SELINUX) {
if ((option_mask32 & OPT_DEREFERENCE
findutils/find.c+2 -2
@@ -467,7 +467,7 @@ IF_FEATURE_FIND_INUM( ACTS(inum, ino_t inode_num;))
IF_FEATURE_FIND_SAMEFILE(ACTS(samefile, ino_t inode_num; dev_t device;))
IF_FEATURE_FIND_USER( ACTS(user, uid_t uid;))
IF_FEATURE_FIND_SIZE( ACTS(size, char size_char; off_t size;))
-IF_FEATURE_FIND_CONTEXT(ACTS(context, security_context_t context;))
+IF_FEATURE_FIND_CONTEXT(ACTS(context, char *context;))
IF_FEATURE_FIND_PAREN( ACTS(paren, action ***subexpr;))
IF_FEATURE_FIND_PRUNE( ACTS(prune))
IF_FEATURE_FIND_QUIT( ACTS(quit))
@@ -983,7 +983,7 @@ ACTF(empty)
#if ENABLE_FEATURE_FIND_CONTEXT
ACTF(context)
{
- security_context_t con;
+ char *con;
int rc;
if (G.recurse_flags & ACTION_FOLLOWLINKS) {
include/libbb.h+3 -3
@@ -1882,10 +1882,10 @@ void getcaps(void *caps) FAST_FUNC;
#if ENABLE_SELINUX
extern void renew_current_security_context(void) FAST_FUNC;
-extern void set_current_security_context(security_context_t sid) FAST_FUNC;
-extern context_t set_security_context_component(security_context_t cur_context,
+extern void set_current_security_context(char *sid) FAST_FUNC;
+extern context_t set_security_context_component(char *cur_context,
char *user, char *role, char *type, char *range) FAST_FUNC;
-extern void setfscreatecon_or_die(security_context_t scontext) FAST_FUNC;
+extern void setfscreatecon_or_die(char *scontext) FAST_FUNC;
extern void selinux_preserve_fcontext(int fdesc) FAST_FUNC;
#else
#define selinux_preserve_fcontext(fdesc) ((void)0)
libbb/copy_file.c+3 -3
@@ -118,10 +118,10 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
#if ENABLE_SELINUX
if ((flags & FILEUTILS_PRESERVE_SECURITY_CONTEXT) && is_selinux_enabled() > 0) {
- security_context_t con;
+ char *con;
if (lgetfilecon(source, &con) >= 0) {
if (setfscreatecon(con) < 0) {
- bb_perror_msg("can't set setfscreatecon %s", con);
+ bb_perror_msg("can't setfscreatecon %s", con);
freecon(con);
return -1;
}
@@ -327,7 +327,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
if ((flags & (FILEUTILS_PRESERVE_SECURITY_CONTEXT|FILEUTILS_SET_SECURITY_CONTEXT))
&& is_selinux_enabled() > 0
) {
- security_context_t con;
+ char *con;
if (getfscreatecon(&con) == -1) {
bb_simple_perror_msg("getfscreatecon");
return -1;
libbb/run_shell.c+2 -2
@@ -33,14 +33,14 @@
#endif
#if ENABLE_SELINUX
-static security_context_t current_sid;
+static char *current_sid;
void FAST_FUNC renew_current_security_context(void)
{
freecon(current_sid); /* Release old context */
getcon(&current_sid); /* update */
}
-void FAST_FUNC set_current_security_context(security_context_t sid)
+void FAST_FUNC set_current_security_context(char *sid)
{
freecon(current_sid); /* Release old context */
current_sid = sid;
libbb/selinux_common.c+3 -3
@@ -9,7 +9,7 @@
#include "libbb.h"
#include <selinux/context.h>
-context_t FAST_FUNC set_security_context_component(security_context_t cur_context,
+context_t FAST_FUNC set_security_context_component(char *cur_context,
char *user, char *role, char *type, char *range)
{
context_t con = context_new(cur_context);
@@ -31,7 +31,7 @@ error:
return NULL;
}
-void FAST_FUNC setfscreatecon_or_die(security_context_t scontext)
+void FAST_FUNC setfscreatecon_or_die(char *scontext)
{
if (setfscreatecon(scontext) < 0) {
/* Can be NULL. All known printf implementations
@@ -43,7 +43,7 @@ void FAST_FUNC setfscreatecon_or_die(security_context_t scontext)
void FAST_FUNC selinux_preserve_fcontext(int fdesc)
{
- security_context_t context;
+ char *context;
if (fgetfilecon(fdesc, &context) < 0) {
if (errno == ENODATA || errno == ENOTSUP)
libbb/update_passwd.c+1 -1
@@ -18,7 +18,7 @@
#if ENABLE_SELINUX
static void check_selinux_update_passwd(const char *username)
{
- security_context_t seuser;
+ char *seuser;
char *p;
if (getuid() != (uid_t)0 || is_selinux_enabled() == 0)
loginutils/login.c+3 -3
@@ -181,9 +181,9 @@ static void die_if_nologin(void)
#if ENABLE_SELINUX
static void initselinux(char *username, char *full_tty,
- security_context_t *user_sid)
+ char **user_sid)
{
- security_context_t old_tty_sid, new_tty_sid;
+ char *old_tty_sid, *new_tty_sid;
if (!is_selinux_enabled())
return;
@@ -333,7 +333,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
char *opt_user = opt_user; /* for compiler */
char *full_tty;
char *short_tty;
- IF_SELINUX(security_context_t user_sid = NULL;)
+ IF_SELINUX(char *user_sid = NULL;)
#if ENABLE_PAM
int pamret;
pam_handle_t *pamh;
selinux/chcon.c+2 -2
@@ -67,8 +67,8 @@ static int FAST_FUNC change_filedir_context(struct recursive_state *state UNUSED
struct stat *stbuf UNUSED_PARAM)
{
context_t context = NULL;
- security_context_t file_context = NULL;
- security_context_t context_string;
+ char *file_context = NULL;
+ const char *context_string;
int rc = FALSE;
int status = 0;
selinux/matchpathcon.c+1 -1
@@ -80,7 +80,7 @@ int matchpathcon_main(int argc UNUSED_PARAM, char **argv)
}
while ((path = *argv++) != NULL) {
- security_context_t con;
+ char *con;
int rc;
if (!(opts & OPT_VERIFY)) {
selinux/runcon.c+2 -2
@@ -62,13 +62,13 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
char *command, int compute_trans)
{
context_t con;
- security_context_t cur_context;
+ char *cur_context;
if (getcon(&cur_context))
bb_simple_error_msg_and_die("can't get current context");
if (compute_trans) {
- security_context_t file_context, new_context;
+ char *file_context, *new_context;
if (getfilecon(command, &file_context) < 0)
bb_error_msg_and_die("can't retrieve attributes of '%s'",
selinux/sestatus.c+1 -1
@@ -92,7 +92,7 @@ static void read_config(char **pc, int npc, char **fc, int nfc)
static void display_verbose(void)
{
- security_context_t con, _con;
+ char *con, *_con;
char *fc[50], *pc[50], *cterm;
pid_t *pidList;
int i;
util-linux/mkswap.c+2 -2
@@ -49,8 +49,8 @@ static void mkswap_selinux_setcontext(int fd, const char *path)
xfstat(fd, &stbuf, path);
if (S_ISREG(stbuf.st_mode)) {
- security_context_t newcon;
- security_context_t oldcon = NULL;
+ const char *newcon;
+ char *oldcon = NULL;
context_t context;
if (fgetfilecon(fd, &oldcon) < 0) {