Diff of /trunk/1.8.x/ccs-patch/security/ccsecurity/network.c

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.8.x/ccs-patch/security/ccsecurity/network.c




Diff of /trunk/1.8.x/ccs-patch/security/ccsecurity/network.c



 Parent Directory

|  Revision Log



|  Patch














revision 2951 by kumaneko,
Tue Aug 25 04:26:20 2009 UTC




revision 3018 by kumaneko,
Sat Sep 12 01:53:49 2009 UTC






#

Line 3 



Line 3 













3
  *
  *

















4
  * Copyright (C) 2005-2009  NTT DATA CORPORATION
  * Copyright (C) 2005-2009  NTT DATA CORPORATION

















5
  *
  *















6


  * Version: 1.7.0-pre   2009/08/24


  * Version: 1.7.0   2009/09/03















7
  *
  *

















8
  * This file is applicable to both 2.4.30 and 2.6.11 and later.
  * This file is applicable to both 2.4.30 and 2.6.11 and later.

















9
  * See README.ccs for ChangeLog.
  * See README.ccs for ChangeLog.











#

Line 171 
 static int ccs_network_entry2(const bool


Line 171 
 static int ccs_network_entry2(const bool












171
         char buf[64];
         char buf[64];

















172
         if (ccs_init_request_info(&r, NULL,
         if (ccs_init_request_info(&r, NULL,

















173
                                   CCS_MAC_NETWORK_UDP_BIND + operation)
                                   CCS_MAC_NETWORK_UDP_BIND + operation)















174


             == CCS_MAC_MODE_DISABLED)


             == CCS_CONFIG_DISABLED)















175
                 return 0;
                 return 0;

















176
         memset(buf, 0, sizeof(buf));
         memset(buf, 0, sizeof(buf));

















177
         if (is_ipv6)
         if (is_ipv6)











#

Line 225 
 static int ccs_network_entry2(const bool


Line 225 
 static int ccs_network_entry2(const bool












225
                 error = ccs_supervisor(&r, CCS_KEYWORD_ALLOW_NETWORK
                 error = ccs_supervisor(&r, CCS_KEYWORD_ALLOW_NETWORK

















226
                                        "%s %s %u\n", keyword, buf, port);
                                        "%s %s %u\n", keyword, buf, port);

















227
         } while (error == 1);
         } while (error == 1);















228


         if (r.mode != CCS_MAC_MODE_ENFORCING)


         if (r.mode != CCS_CONFIG_ENFORCING)















229
                 error = 0;
                 error = 0;

















230
         return error;
         return error;

















231
 }
 }











#

Line 797 
 int ccs_socket_sendmsg_permission(struct


Line 797 
 int ccs_socket_sendmsg_permission(struct












797
 
 

















798
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)

















799
 #if !defined(RHEL_MAJOR) || RHEL_MAJOR != 5
 #if !defined(RHEL_MAJOR) || RHEL_MAJOR != 5












800
 
 #if !defined(AX_MAJOR) || AX_MAJOR != 3 || !defined(AX_MINOR) || AX_MINOR < 2












801
 
 

















802
 static inline struct iphdr *ip_hdr(const struct sk_buff *skb)
 static inline struct iphdr *ip_hdr(const struct sk_buff *skb)

















803
 {
 {











#

Line 815 
 static inline struct ipv6hdr *ipv6_hdr(c


Line 816 
 static inline struct ipv6hdr *ipv6_hdr(c












816
 
 

















817
 #endif
 #endif

















818
 #endif
 #endif












819
 
 #endif












820
 
 

















821
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)

















822
 static void skb_kill_datagram(struct sock *sk, struct sk_buff *skb,
 static void skb_kill_datagram(struct sock *sk, struct sk_buff *skb,





























Legend:



Removed from v.2951
 


changed lines


 
Added in v.3018













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/trunk/1.8.x/ccs-patch/security/ccsecurity/network.c
-revision 2951 by kumaneko,
Tue Aug 25 04:26:20 2009 UTC
+revision 3018 by kumaneko,
Sat Sep 12 01:53:49 2009 UTC
 Line 3
   *
   * Copyright (C) 2005-2009  NTT DATA CORPORATION
   *
-  * Version: 1.7.0-pre   2009/08/24
+  * Version: 1.7.0   2009/09/03
   *
   * This file is applicable to both 2.4.30 and 2.6.11 and later.
   * See README.ccs for ChangeLog.
 Line 171 
 static int ccs_network_entry2(const bool
          char buf[64];
          if (ccs_init_request_info(&r, NULL,
                                    CCS_MAC_NETWORK_UDP_BIND + operation)
-             == CCS_MAC_MODE_DISABLED)
+             == CCS_CONFIG_DISABLED)
                  return 0;
          memset(buf, 0, sizeof(buf));
          if (is_ipv6)
 Line 225 
 static int ccs_network_entry2(const bool
                  error = ccs_supervisor(&r, CCS_KEYWORD_ALLOW_NETWORK
                                         "%s %s %u\n", keyword, buf, port);
          } while (error == 1);
-         if (r.mode != CCS_MAC_MODE_ENFORCING)
+         if (r.mode != CCS_CONFIG_ENFORCING)
                  error = 0;
          return error;
  }
 Line 797 
 int ccs_socket_sendmsg_permission(struct
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
  #if !defined(RHEL_MAJOR) || RHEL_MAJOR != 5
+ #if !defined(AX_MAJOR) || AX_MAJOR != 3 || !defined(AX_MINOR) || AX_MINOR < 2
  static inline struct iphdr *ip_hdr(const struct sk_buff *skb)
  {
-Line 815 
 static inline struct ipv6hdr *ipv6_hdr(c
+Line 816 
 static inline struct ipv6hdr *ipv6_hdr(c
  #endif
  #endif
+ #endif
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
  static void skb_kill_datagram(struct sock *sk, struct sk_buff *skb,
 Legend:



Removed from v.2951
 


changed lines


 
Added in v.3018
 Legend:



Removed from v.2951
 


changed lines


 
Added in v.3018
-Removed from v.2951
+Added in v.3018
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

オープンソース・ソフトウェアの開発とダウンロード

TOMOYO

Subversion リポジトリの参照