• R/O
  • SSH
  • HTTPS

akari: Commit


Commit MetaInfo

Revisión624 (tree)
Tiempo2020-02-10 20:12:07
Autorkumaneko

Log Message

(empty log message)

Cambiar Resumen

Diferencia

--- trunk/akari/permission.c (revision 623)
+++ trunk/akari/permission.c (revision 624)
@@ -1479,7 +1479,9 @@
14791479 }
14801480 /* Same with put_arg_page(page) in fs/exec.c */
14811481 #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)
14831485 put_user_page(page);
14841486 #else
14851487 put_page(page);
--- trunk/akari/policy_io.c (revision 623)
+++ trunk/akari/policy_io.c (revision 624)
@@ -1275,6 +1275,14 @@
12751275 #endif
12761276
12771277 /* 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
12781286 static
12791287 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17)
12801288 const
@@ -1285,8 +1293,18 @@
12851293 #endif
12861294 .read = ccs_read_self,
12871295 };
1296+#endif
12881297
12891298 /* 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
12901308 static
12911309 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17)
12921310 const
@@ -1298,6 +1316,7 @@
12981316 .read = ccs_read,
12991317 .write = ccs_write,
13001318 };
1319+#endif
13011320
13021321 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
13031322
Show on old repository browser