• R/O
  • SSH
  • HTTPS

akari: Commit


Commit MetaInfo

Revision588 (tree)
Time2018-04-01 14:22:51
Authorkumaneko

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/akari/README (revision 587)
+++ trunk/akari/README (revision 588)
@@ -309,3 +309,11 @@
309309 Version 1.0.37 2017/09/17 Minor update release.
310310
311311 Use smp_rmb() when waiting for hook readiness.
312+
313+Version 1.0.38 2018/04/01 Minor update release.
314+
315+ Synchronize with TOMOYO revision 6638.
316+
317+ Due to incorrect probe_kernel_write() usage, previously registered LSM
318+ hook (if any) was by error overwritten by this hook. This bug affects
319+ only 4.12 and later kernels.
--- trunk/akari/lsm-2.6.0-vfs.c (revision 587)
+++ trunk/akari/lsm-2.6.0-vfs.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2010-2015 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
55 *
6- * Version: 1.0.37 2017/09/17
6+ * Version: 1.0.38 2018/04/01
77 */
88
99 #include "internal.h"
@@ -1422,7 +1422,7 @@
14221422 goto out;
14231423 ccs_main_init();
14241424 ccs_update_security_ops(ops);
1425- printk(KERN_INFO "AKARI: 1.0.37 2017/09/17\n");
1425+ printk(KERN_INFO "AKARI: 1.0.38 2018/04/01\n");
14261426 printk(KERN_INFO
14271427 "Access Keeping And Regulating Instrument registered.\n");
14281428 return 0;
--- trunk/akari/lsm-2.6.0.c (revision 587)
+++ trunk/akari/lsm-2.6.0.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2010-2015 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
55 *
6- * Version: 1.0.37 2017/09/17
6+ * Version: 1.0.38 2018/04/01
77 */
88
99 #include "internal.h"
@@ -1402,7 +1402,7 @@
14021402 goto out;
14031403 ccs_main_init();
14041404 ccs_update_security_ops(ops);
1405- printk(KERN_INFO "AKARI: 1.0.37 2017/09/17\n");
1405+ printk(KERN_INFO "AKARI: 1.0.38 2018/04/01\n");
14061406 printk(KERN_INFO
14071407 "Access Keeping And Regulating Instrument registered.\n");
14081408 return 0;
--- trunk/akari/lsm-2.6.29.c (revision 587)
+++ trunk/akari/lsm-2.6.29.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2010-2015 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
55 *
6- * Version: 1.0.37 2017/09/17
6+ * Version: 1.0.38 2018/04/01
77 */
88
99 #include "internal.h"
@@ -1968,7 +1968,7 @@
19681968 }
19691969 ccs_main_init();
19701970 ccs_update_security_ops(ops);
1971- printk(KERN_INFO "AKARI: 1.0.37 2017/09/17\n");
1971+ printk(KERN_INFO "AKARI: 1.0.38 2018/04/01\n");
19721972 printk(KERN_INFO
19731973 "Access Keeping And Regulating Instrument registered.\n");
19741974 return 0;
--- trunk/akari/lsm-4.12.c (revision 587)
+++ trunk/akari/lsm-4.12.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2010-2015 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
55 *
6- * Version: 1.0.37 2017/09/17
6+ * Version: 1.0.38 2018/04/01
77 */
88
99 #include "internal.h"
@@ -1142,7 +1142,7 @@
11421142 for (idx = 0; idx < ro_pages_len; idx++)
11431143 clear_bit(_PAGE_BIT_RW, &(ro_pages[idx]->flags));
11441144 #endif
1145- printk(KERN_INFO "AKARI: 1.0.37 2017/09/17\n");
1145+ printk(KERN_INFO "AKARI: 1.0.38 2018/04/01\n");
11461146 printk(KERN_INFO
11471147 "Access Keeping And Regulating Instrument registered.\n");
11481148 return 0;
--- trunk/akari/lsm-4.2.c (revision 587)
+++ trunk/akari/lsm-4.2.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2010-2015 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
55 *
6- * Version: 1.0.37 2017/09/17
6+ * Version: 1.0.38 2018/04/01
77 */
88
99 #include "internal.h"
@@ -1239,7 +1239,7 @@
12391239 swap_hook(&akari_hooks[2], &original_cred_alloc_blank);
12401240 for (idx = 3; idx < ARRAY_SIZE(akari_hooks); idx++)
12411241 add_hook(&akari_hooks[idx]);
1242- printk(KERN_INFO "AKARI: 1.0.37 2017/09/17\n");
1242+ printk(KERN_INFO "AKARI: 1.0.38 2018/04/01\n");
12431243 printk(KERN_INFO
12441244 "Access Keeping And Regulating Instrument registered.\n");
12451245 return 0;
--- trunk/akari/lsm-4.7.c (revision 587)
+++ trunk/akari/lsm-4.7.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2010-2015 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
55 *
6- * Version: 1.0.37 2017/09/17
6+ * Version: 1.0.38 2018/04/01
77 */
88
99 #include "internal.h"
@@ -1242,7 +1242,7 @@
12421242 swap_hook(&akari_hooks[2], &original_cred_alloc_blank);
12431243 for (idx = 3; idx < ARRAY_SIZE(akari_hooks); idx++)
12441244 add_hook(&akari_hooks[idx]);
1245- printk(KERN_INFO "AKARI: 1.0.37 2017/09/17\n");
1245+ printk(KERN_INFO "AKARI: 1.0.38 2018/04/01\n");
12461246 printk(KERN_INFO
12471247 "Access Keeping And Regulating Instrument registered.\n");
12481248 return 0;
--- trunk/akari/lsm.c (revision 587)
+++ trunk/akari/lsm.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2010-2015 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
55 *
6- * Version: 1.0.37 2017/09/17
6+ * Version: 1.0.38 2018/04/01
77 */
88
99 #include <linux/version.h>
--- trunk/akari/memory.c (revision 587)
+++ trunk/akari/memory.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.5 2015/11/11
6+ * Version: 1.8.5+ 2018/04/01
77 */
88
99 #include "internal.h"
--- trunk/akari/permission.c (revision 587)
+++ trunk/akari/permission.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.5 2015/11/11
6+ * Version: 1.8.5+ 2018/04/01
77 */
88
99 #include "internal.h"
@@ -3365,6 +3365,7 @@
33653365 int addr_len;
33663366 if (!family || (type != SOCK_STREAM && type != SOCK_SEQPACKET))
33673367 return 0;
3368+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
33683369 {
33693370 const int error = sock->ops->getname(sock, (struct sockaddr *)
33703371 &addr, &addr_len, 0);
@@ -3371,6 +3372,11 @@
33713372 if (error)
33723373 return error;
33733374 }
3375+#else
3376+ addr_len = sock->ops->getname(sock, (struct sockaddr *) &addr, 0);
3377+ if (addr_len < 0)
3378+ return addr_len;
3379+#endif
33743380 address.protocol = type;
33753381 address.operation = CCS_NETWORK_LISTEN;
33763382 if (family == PF_UNIX)
@@ -3497,6 +3503,7 @@
34973503 int addr_len;
34983504 if (!family || (type != SOCK_STREAM && type != SOCK_SEQPACKET))
34993505 return 0;
3506+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
35003507 {
35013508 const int error = newsock->ops->getname(newsock,
35023509 (struct sockaddr *)
@@ -3504,6 +3511,12 @@
35043511 if (error)
35053512 return error;
35063513 }
3514+#else
3515+ addr_len = newsock->ops->getname(newsock, (struct sockaddr *) &addr,
3516+ 2);
3517+ if (addr_len < 0)
3518+ return addr_len;
3519+#endif
35073520 address.protocol = type;
35083521 address.operation = CCS_NETWORK_ACCEPT;
35093522 if (family == PF_UNIX)
--- trunk/akari/policy_io.c (revision 587)
+++ trunk/akari/policy_io.c (revision 588)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.5+ 2017/02/20
6+ * Version: 1.8.5+ 2018/04/01
77 */
88
99 #include "internal.h"
@@ -2419,7 +2419,7 @@
24192419 struct ccs_domain_info *domain;
24202420 const int idx = ccs_read_lock();
24212421 ccs_policy_loaded = true;
2422- printk(KERN_INFO "CCSecurity: 1.8.5+ 2017/02/20\n");
2422+ printk(KERN_INFO "CCSecurity: 1.8.5+ 2018/04/01\n");
24232423 list_for_each_entry_srcu(domain, &ccs_domain_list, list, &ccs_ss) {
24242424 const u8 profile = domain->profile;
24252425 struct ccs_policy_namespace *ns = domain->ns;
Show on old repository browser