← Back to branch summary

~mathiaz/apparmor/ubuntu-mathiaz

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/sysctl-pathname.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/sysctl-pathname.diff
6
6
 
7
7
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
8
8
Signed-off-by: John Johansen <jjohansen@suse.de>
 
9
Reviewed-by: James Morris <jmorris@namei.org>
9
10
 
10
11
---
11
12
 include/linux/sysctl.h   |    2 ++
15
16
 
16
17
--- a/include/linux/sysctl.h
17
18
+++ b/include/linux/sysctl.h
18
 
@@ -963,6 +963,8 @@ extern int proc_doulongvec_minmax(ctl_ta
19
 
 extern int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int,
 
19
@@ -983,6 +983,8 @@ extern int proc_doulongvec_minmax(struct
 
20
 extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int,
20
21
                                      struct file *, void __user *, size_t *, loff_t *);
21
22
 
22
23
+extern char *sysctl_pathname(ctl_table *, char *, int);
26
27
                      void __user *newval, size_t newlen);
27
28
--- a/kernel/sysctl.c
28
29
+++ b/kernel/sysctl.c
29
 
@@ -1297,6 +1297,33 @@ struct ctl_table_header *sysctl_head_nex
 
30
@@ -1327,6 +1327,33 @@ struct ctl_table_header *sysctl_head_nex
30
31
        return NULL;
31
32
 }
32
33
 
62
63
               void __user *newval, size_t newlen)
63
64
--- a/security/selinux/hooks.c
64
65
+++ b/security/selinux/hooks.c
65
 
@@ -1427,40 +1427,15 @@ static int selinux_capable(struct task_s
 
66
@@ -1431,40 +1431,15 @@ static int selinux_capable(struct task_s
66
67
 
67
68
 static int selinux_sysctl_get_sid(ctl_table *table, u16 tclass, u32 *sid)
68
69
 {