hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apparmor: fix apparmor_query data 

The data being queried isn't always the current profile and a lookup
relative to the current profile should be done.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2017-06-09 02:28:19 -07:00
parent 60285eb3e7
commit 5262ef60b1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/apparmor/apparmorfs.c
View File

@ -650,7 +650,7 @@ static ssize_t query_data(char *buf, size_t buf_len,
{ {
char *out; char *out;
const char *key; const char *key;
struct aa_profile *profile; struct aa_profile *profile, *curr;
struct aa_data *data; struct aa_data *data;
u32 bytes, blocks; u32 bytes, blocks;
__le32 outle32; __le32 outle32;
@ -667,7 +667,10 @@ static ssize_t query_data(char *buf, size_t buf_len,
if (buf_len < sizeof(bytes) + sizeof(blocks)) if (buf_len < sizeof(bytes) + sizeof(blocks))
return -EINVAL; /* not enough space */ return -EINVAL; /* not enough space */
profile = aa_current_profile(); curr = aa_current_profile();
profile = aa_fqlookupn_profile(curr, query, strnlen(query, query_len));
if (!profile)
return -ENOENT;
/* We are going to leave space for two numbers. The first is the total /* We are going to leave space for two numbers. The first is the total
* number of bytes we are writing after the first number. This is so * number of bytes we are writing after the first number. This is so
@ -696,6 +699,7 @@ static ssize_t query_data(char *buf, size_t buf_len,
blocks++; blocks++;
} }
} }
aa_put_profile(profile);
outle32 = __cpu_to_le32(out - buf - sizeof(bytes)); outle32 = __cpu_to_le32(out - buf - sizeof(bytes));
memcpy(buf, &outle32, sizeof(outle32)); memcpy(buf, &outle32, sizeof(outle32));