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

Subversion リポジトリの参照

Diff of /trunk/1.6.x/ccs-patch/patches/ccs-patch-2.6.21.diff

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 448 by kumaneko, Wed Sep 5 06:56:56 2007 UTC revision 449 by kumaneko, Thu Sep 6 08:31:39 2007 UTC
# Line 216  diff -ubBpEr linux-2.6.21/fs/namei.c lin Line 216  diff -ubBpEr linux-2.6.21/fs/namei.c lin
216                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
217                          return -EPERM;                          return -EPERM;
218    
219  +    /***** TOMOYO Linux start. *****/  +       /***** TOMOYO Linux start. *****/
220  +       error = CheckOpenPermission(dentry, nd->mnt, flag); /* includes O_APPEND and O_TRUNC checks */  +       error = CheckOpenPermission(dentry, nd->mnt, flag); /* includes O_APPEND and O_TRUNC checks */
221  +    if (error) return error;  +       if (error) return error;
222  +    /***** TOMOYO Linux end. *****/  +       /***** TOMOYO Linux end. *****/
223  +  +
224          /*          /*
225           * Ensure there are no outstanding leases on the file.           * Ensure there are no outstanding leases on the file.
# Line 993  diff -ubBpEr linux-2.6.21/net/core/datag Line 993  diff -ubBpEr linux-2.6.21/net/core/datag
993                  } else                  } else
994                          skb = skb_dequeue(&sk->sk_receive_queue);                          skb = skb_dequeue(&sk->sk_receive_queue);
995    
996  +                /***** TOMOYO Linux start. *****/  +               /***** TOMOYO Linux start. *****/
997  +                if ((error = CheckSocketRecvDatagramPermission(sk, skb, flags)) < 0) goto no_packet;  +               if ((error = CheckSocketRecvDatagramPermission(sk, skb, flags)) < 0) goto no_packet;
998  +                /***** TOMOYO Linux end. *****/  +               /***** TOMOYO Linux end. *****/
999  +  +
1000                  if (skb)                  if (skb)
1001                          return skb;                          return skb;

Legend:
Removed from v.448  
changed lines
  Added in v.449

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26