(empty log message)
trunk/akari/permission.c (diff) trunk/akari/policy_io.c (diff)| @@ -1479,7 +1479,9 @@ | ||
| 1479 | 1479 | } |
| 1480 | 1480 | /* Same with put_arg_page(page) in fs/exec.c */ |
| 1481 | 1481 | #ifdef CCS_BPRM_MMU |
| 1482 | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) | |
| 1482 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) | |
| 1483 | + unpin_user_page(page); | |
| 1484 | +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) | |
| 1483 | 1485 | put_user_page(page); |
| 1484 | 1486 | #else |
| 1485 | 1487 | put_page(page); |
| @@ -1275,6 +1275,14 @@ | ||
| 1275 | 1275 | #endif |
| 1276 | 1276 | |
| 1277 | 1277 | /* Operations for /proc/ccs/self_domain interface. */ |
| 1278 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) | |
| 1279 | +static const struct proc_ops ccs_self_operations = { | |
| 1280 | +#ifdef CONFIG_CCSECURITY_TASK_DOMAIN_TRANSITION | |
| 1281 | + .proc_write = ccs_write_self, | |
| 1282 | +#endif | |
| 1283 | + .proc_read = ccs_read_self, | |
| 1284 | +}; | |
| 1285 | +#else | |
| 1278 | 1286 | static |
| 1279 | 1287 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) |
| 1280 | 1288 | const |
| @@ -1285,8 +1293,18 @@ | ||
| 1285 | 1293 | #endif |
| 1286 | 1294 | .read = ccs_read_self, |
| 1287 | 1295 | }; |
| 1296 | +#endif | |
| 1288 | 1297 | |
| 1289 | 1298 | /* Operations for /proc/ccs/ interface. */ |
| 1299 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) | |
| 1300 | +static const struct proc_ops ccs_operations = { | |
| 1301 | + .proc_open = ccs_open, | |
| 1302 | + .proc_release = ccs_release, | |
| 1303 | + .proc_poll = ccs_poll, | |
| 1304 | + .proc_read = ccs_read, | |
| 1305 | + .proc_write = ccs_write, | |
| 1306 | +}; | |
| 1307 | +#else | |
| 1290 | 1308 | static |
| 1291 | 1309 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) |
| 1292 | 1310 | const |
| @@ -1298,6 +1316,7 @@ | ||
| 1298 | 1316 | .read = ccs_read, |
| 1299 | 1317 | .write = ccs_write, |
| 1300 | 1318 | }; |
| 1319 | +#endif | |
| 1301 | 1320 | |
| 1302 | 1321 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) |
| 1303 | 1322 |
