← Back to branch summary

~mathiaz/apparmor/ubuntu-mathiaz

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/fix-net.diff

  • Committer: Mathias Gug
  • Date: 2008-02-04 18:57:00 UTC
  • mfrom: (885.1.5 apparmor)
  • Revision ID: mathiaz@ubuntu.com-20080204185700-wwlyq0ksssxclv8w
Merge  ubuntu branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel-patches/for-mainline/fix-net.diff
 
1
---
 
2
 security/apparmor/lsm.c |   18 ------------------
 
3
 1 file changed, 18 deletions(-)
 
4
 
 
5
--- a/security/apparmor/lsm.c
 
6
+++ b/security/apparmor/lsm.c
 
7
@@ -717,22 +717,6 @@ static int apparmor_socket_shutdown(stru
 
8
        return aa_revalidate_sk(sk, "socket_shutdown");
 
9
 }
 
10
 
 
11
-static int apparmor_socket_getpeersec_stream(struct socket *sock,
 
12
-                       char __user *optval, int __user *optlen, unsigned len)
 
13
-{
 
14
-       struct sock *sk = sock->sk;
 
15
-
 
16
-       return aa_revalidate_sk(sk, "socket_getpeersec_stream");
 
17
-}
 
18
-
 
19
-static int apparmor_socket_getpeersec_dgram(struct socket *sock,
 
20
-                                       struct sk_buff *skb, u32 *secid)
 
21
-{
 
22
-       struct sock *sk = sock->sk;
 
23
-
 
24
-       return aa_revalidate_sk(sk, "socket_getpeersec_dgram");
 
25
-}
 
26
-
 
27
 static int apparmor_getprocattr(struct task_struct *task, char *name,
 
28
                                char **value)
 
29
 {
 
30
@@ -882,8 +866,6 @@ struct security_operations apparmor_ops 
 
31
        .socket_getsockopt =            apparmor_socket_getsockopt,
 
32
        .socket_setsockopt =            apparmor_socket_setsockopt,
 
33
        .socket_shutdown =              apparmor_socket_shutdown,
 
34
-       .socket_getpeersec_stream =     apparmor_socket_getpeersec_stream,
 
35
-       .socket_getpeersec_dgram =      apparmor_socket_getpeersec_dgram,
 
36
 };
 
37
 
 
38
 static void info_message(const char *str)