diff options
Diffstat (limited to 'security/smack/smack_lsm.c')
| -rw-r--r-- | security/smack/smack_lsm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index c448d57ae2b7..bc39f4067af6 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
| @@ -1281,12 +1281,11 @@ static int smack_task_getioprio(struct task_struct *p) | |||
| 1281 | * | 1281 | * |
| 1282 | * Return 0 if read access is permitted | 1282 | * Return 0 if read access is permitted |
| 1283 | */ | 1283 | */ |
| 1284 | static int smack_task_setscheduler(struct task_struct *p, int policy, | 1284 | static int smack_task_setscheduler(struct task_struct *p) |
| 1285 | struct sched_param *lp) | ||
| 1286 | { | 1285 | { |
| 1287 | int rc; | 1286 | int rc; |
| 1288 | 1287 | ||
| 1289 | rc = cap_task_setscheduler(p, policy, lp); | 1288 | rc = cap_task_setscheduler(p); |
| 1290 | if (rc == 0) | 1289 | if (rc == 0) |
| 1291 | rc = smk_curacc_on_task(p, MAY_WRITE); | 1290 | rc = smk_curacc_on_task(p, MAY_WRITE); |
| 1292 | return rc; | 1291 | return rc; |
| @@ -3005,7 +3004,8 @@ static int smack_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) | |||
| 3005 | { | 3004 | { |
| 3006 | char *sp = smack_from_secid(secid); | 3005 | char *sp = smack_from_secid(secid); |
| 3007 | 3006 | ||
| 3008 | *secdata = sp; | 3007 | if (secdata) |
| 3008 | *secdata = sp; | ||
| 3009 | *seclen = strlen(sp); | 3009 | *seclen = strlen(sp); |
| 3010 | return 0; | 3010 | return 0; |
| 3011 | } | 3011 | } |
