Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 843d183cdd816549b73e6bd3ae07f64adddf714b

Authored by Tetsuo Handa
Committed by James Morris
1 parent a8f7640963
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

TOMOYO: Bump version. 

Tell userland tools that this is TOMOYO 2.5.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>

Showing 4 changed files with 10 additions and 10 deletions Side-by-side Diff

... ... @@ -6443,7 +6443,7 @@
6443 6443 L: tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
6444 6444 L: tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
6445 6445 W: http://tomoyo.sourceforge.jp/
6446   -T: quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.4.x/tomoyo-lsm/patches/
  6446 +T: quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.5.x/tomoyo-lsm/patches/
6447 6447 S: Maintained
6448 6448 F: security/tomoyo/
6449 6449  
security/tomoyo/Makefile
Diff comments   View file @ 843d183
... ... @@ -27,7 +27,7 @@
27 27 @touch $@
28 28  
29 29 $(obj)/builtin-policy.h: $(obj)/policy/profile.conf $(obj)/policy/exception_policy.conf $(obj)/policy/domain_policy.conf $(obj)/policy/manager.conf $(obj)/policy/stat.conf
30   - @echo Generating built-in policy for TOMOYO 2.4.x.
  30 + @echo Generating built-in policy for TOMOYO 2.5.x.
31 31 @echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp
32 32 @sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/profile.conf >> $@.tmp
33 33 @echo "\"\";" >> $@.tmp
security/tomoyo/common.c
Diff comments   View file @ 843d183
... ... @@ -345,7 +345,7 @@
345 345 INIT_LIST_HEAD(&ns->group_list[idx]);
346 346 for (idx = 0; idx < TOMOYO_MAX_POLICY; idx++)
347 347 INIT_LIST_HEAD(&ns->policy_list[idx]);
348   - ns->profile_version = 20100903;
  348 + ns->profile_version = 20110903;
349 349 tomoyo_namespace_enabled = !list_empty(&tomoyo_namespace_list);
350 350 list_add_tail_rcu(&ns->namespace_list, &tomoyo_namespace_list);
351 351 }
... ... @@ -2222,7 +2222,7 @@
2222 2222 static void tomoyo_read_version(struct tomoyo_io_buffer *head)
2223 2223 {
2224 2224 if (!head->r.eof) {
2225   - tomoyo_io_printf(head, "2.4.0");
  2225 + tomoyo_io_printf(head, "2.5.0");
2226 2226 head->r.eof = true;
2227 2227 }
2228 2228 }
2229 2229  
... ... @@ -2694,11 +2694,11 @@
2694 2694 struct tomoyo_domain_info *domain;
2695 2695 const int idx = tomoyo_read_lock();
2696 2696 tomoyo_policy_loaded = true;
2697   - printk(KERN_INFO "TOMOYO: 2.4.0\n");
  2697 + printk(KERN_INFO "TOMOYO: 2.5.0\n");
2698 2698 list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
2699 2699 const u8 profile = domain->profile;
2700 2700 const struct tomoyo_policy_namespace *ns = domain->ns;
2701   - if (ns->profile_version != 20100903)
  2701 + if (ns->profile_version != 20110903)
2702 2702 printk(KERN_ERR
2703 2703 "Profile version %u is not supported.\n",
2704 2704 ns->profile_version);
2705 2705  
... ... @@ -2709,9 +2709,9 @@
2709 2709 else
2710 2710 continue;
2711 2711 printk(KERN_ERR
2712   - "Userland tools for TOMOYO 2.4 must be installed and "
  2712 + "Userland tools for TOMOYO 2.5 must be installed and "
2713 2713 "policy must be initialized.\n");
2714   - printk(KERN_ERR "Please see http://tomoyo.sourceforge.jp/2.4/ "
  2714 + printk(KERN_ERR "Please see http://tomoyo.sourceforge.jp/2.5/ "
2715 2715 "for more information.\n");
2716 2716 panic("STOP!");
2717 2717 }
security/tomoyo/common.h
Diff comments   View file @ 843d183
... ... @@ -3,7 +3,7 @@
3 3 *
4 4 * Header file for TOMOYO.
5 5 *
6   - * Copyright (C) 2005-2010 NTT DATA CORPORATION
  6 + * Copyright (C) 2005-2011 NTT DATA CORPORATION
7 7 */
8 8  
9 9 #ifndef _SECURITY_TOMOYO_COMMON_H
... ... @@ -901,7 +901,7 @@
901 901 struct list_head acl_group[TOMOYO_MAX_ACL_GROUPS];
902 902 /* List for connecting to tomoyo_namespace_list list. */
903 903 struct list_head namespace_list;
904   - /* Profile version. Currently only 20100903 is defined. */
  904 + /* Profile version. Currently only 20110903 is defined. */
905 905 unsigned int profile_version;
906 906 /* Name of this namespace (e.g. "<kernel>", "</usr/sbin/httpd>" ). */
907 907 const char *name;