mirror of
https://github.com/SELinuxProject/selinux
synced 2025-03-31 16:26:10 +00:00
libsepol: sepol_{bool|iface|user}_key_create: copy name
The sepol_{bool|iface|user}_key_create() functions were not copying the name. This produces a use-after-free in the swig-generated code for python3 bindings. Copy the name in these functions, and free it upon sepol_{bool|iface|user}_key_free(). Reported-by: Nicolas Iooss <nicolas.iooss@m4x.org> Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
This commit is contained in:
parent
5e911ee825
commit
eac6f1f1b5
libsepol/src
@ -15,7 +15,7 @@ struct sepol_bool {
|
||||
|
||||
struct sepol_bool_key {
|
||||
/* This boolean's name */
|
||||
const char *name;
|
||||
char *name;
|
||||
};
|
||||
|
||||
int sepol_bool_key_create(sepol_handle_t * handle,
|
||||
@ -30,7 +30,12 @@ int sepol_bool_key_create(sepol_handle_t * handle,
|
||||
return STATUS_ERR;
|
||||
}
|
||||
|
||||
tmp_key->name = name;
|
||||
tmp_key->name = strdup(name);
|
||||
if (!tmp_key->name) {
|
||||
ERR(handle, "out of memory, " "could not create boolean key");
|
||||
free(tmp_key);
|
||||
return STATUS_ERR;
|
||||
}
|
||||
|
||||
*key_ptr = tmp_key;
|
||||
return STATUS_SUCCESS;
|
||||
@ -62,6 +67,7 @@ int sepol_bool_key_extract(sepol_handle_t * handle,
|
||||
|
||||
void sepol_bool_key_free(sepol_bool_key_t * key)
|
||||
{
|
||||
free(key->name);
|
||||
free(key);
|
||||
}
|
||||
|
||||
|
@ -20,7 +20,7 @@ struct sepol_iface {
|
||||
struct sepol_iface_key {
|
||||
|
||||
/* Interface name */
|
||||
const char *name;
|
||||
char *name;
|
||||
};
|
||||
|
||||
/* Key */
|
||||
@ -36,7 +36,12 @@ int sepol_iface_key_create(sepol_handle_t * handle,
|
||||
return STATUS_ERR;
|
||||
}
|
||||
|
||||
tmp_key->name = name;
|
||||
tmp_key->name = strdup(name);
|
||||
if (!tmp_key->name) {
|
||||
ERR(handle, "out of memory, could not create interface key");
|
||||
free(tmp_key);
|
||||
return STATUS_ERR;
|
||||
}
|
||||
|
||||
*key_ptr = tmp_key;
|
||||
return STATUS_SUCCESS;
|
||||
@ -68,6 +73,7 @@ int sepol_iface_key_extract(sepol_handle_t * handle,
|
||||
|
||||
void sepol_iface_key_free(sepol_iface_key_t * key)
|
||||
{
|
||||
free(key->name);
|
||||
free(key);
|
||||
}
|
||||
|
||||
|
@ -24,7 +24,7 @@ struct sepol_user {
|
||||
|
||||
struct sepol_user_key {
|
||||
/* This user's name */
|
||||
const char *name;
|
||||
char *name;
|
||||
};
|
||||
|
||||
int sepol_user_key_create(sepol_handle_t * handle,
|
||||
@ -40,7 +40,12 @@ int sepol_user_key_create(sepol_handle_t * handle,
|
||||
return STATUS_ERR;
|
||||
}
|
||||
|
||||
tmp_key->name = name;
|
||||
tmp_key->name = strdup(name);
|
||||
if (!tmp_key->name) {
|
||||
ERR(handle, "out of memory, could not create selinux user key");
|
||||
free(tmp_key);
|
||||
return STATUS_ERR;
|
||||
}
|
||||
|
||||
*key_ptr = tmp_key;
|
||||
return STATUS_SUCCESS;
|
||||
@ -71,6 +76,7 @@ int sepol_user_key_extract(sepol_handle_t * handle,
|
||||
|
||||
void sepol_user_key_free(sepol_user_key_t * key)
|
||||
{
|
||||
free(key->name);
|
||||
free(key);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user