Added missing Xen Kernel Patches which were not commited because

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.apparmor / sysctl-pathname.diff

diff --git a/src/patches/suse-2.6.27.31/patches.apparmor/sysctl-pathname.diff b/src/patches/suse-2.6.27.31/patches.apparmor/sysctl-pathname.diff
new file mode 100644 (file)
index 0000000..33c747c
--- /dev/null
+++ b/src/patches/suse-2.6.27.31/patches.apparmor/sysctl-pathname.diff
@@ -0,0 +1,111 @@
+From: Andreas Gruenbacher <agruen@suse.de>
+Subject: Factor out sysctl pathname code
+
+Convert the selinux sysctl pathname computation code into a standalone
+function.
+
+Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
+Signed-off-by: John Johansen <jjohansen@suse.de>
+Reviewed-by: James Morris <jmorris@namei.org>
+
+---
+ include/linux/sysctl.h   |    2 ++
+ kernel/sysctl.c          |   27 +++++++++++++++++++++++++++
+ security/selinux/hooks.c |   34 +++++-----------------------------
+ 3 files changed, 34 insertions(+), 29 deletions(-)
+
+--- a/include/linux/sysctl.h
++++ b/include/linux/sysctl.h
+@@ -996,6 +996,8 @@ extern int proc_doulongvec_minmax(struct
+ extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int,
+                                     struct file *, void __user *, size_t *, loff_t *);
+ 
++extern char *sysctl_pathname(ctl_table *, char *, int);
++
+ extern int do_sysctl (int __user *name, int nlen,
+                     void __user *oldval, size_t __user *oldlenp,
+                     void __user *newval, size_t newlen);
+--- a/kernel/sysctl.c
++++ b/kernel/sysctl.c
+@@ -1552,6 +1552,33 @@ void register_sysctl_root(struct ctl_tab
+       spin_unlock(&sysctl_lock);
+ }
+ 
++char *sysctl_pathname(struct ctl_table *table, char *buffer, int buflen)
++{
++      if (buflen < 1)
++              return NULL;
++      buffer += --buflen;
++      *buffer = '\0';
++
++      while (table) {
++              int namelen = strlen(table->procname);
++
++              if (buflen < namelen + 1)
++                      return NULL;
++              buflen -= namelen + 1;
++              buffer -= namelen;
++              memcpy(buffer, table->procname, namelen);
++              *--buffer = '/';
++              table = table->parent;
++      }
++      if (buflen < 4)
++              return NULL;
++      buffer -= 4;
++      memcpy(buffer, "/sys", 4);
++
++      return buffer;
++}
++EXPORT_SYMBOL_GPL(sysctl_pathname);
++
+ #ifdef CONFIG_SYSCTL_SYSCALL
+ /* Perform the actual read/write of a sysctl table entry. */
+ static int do_sysctl_strategy(struct ctl_table_root *root,
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -1811,40 +1811,16 @@ static int selinux_capable(struct task_s
+ 
+ static int selinux_sysctl_get_sid(ctl_table *table, u16 tclass, u32 *sid)
+ {
+-      int buflen, rc;
+-      char *buffer, *path, *end;
++      char *buffer, *path;
++      int rc = -ENOMEM;
+ 
+-      rc = -ENOMEM;
+       buffer = (char *)__get_free_page(GFP_KERNEL);
+       if (!buffer)
+               goto out;
+ 
+-      buflen = PAGE_SIZE;
+-      end = buffer+buflen;
+-      *--end = '\0';
+-      buflen--;
+-      path = end-1;
+-      *path = '/';
+-      while (table) {
+-              const char *name = table->procname;
+-              size_t namelen = strlen(name);
+-              buflen -= namelen + 1;
+-              if (buflen < 0)
+-                      goto out_free;
+-              end -= namelen;
+-              memcpy(end, name, namelen);
+-              *--end = '/';
+-              path = end;
+-              table = table->parent;
+-      }
+-      buflen -= 4;
+-      if (buflen < 0)
+-              goto out_free;
+-      end -= 4;
+-      memcpy(end, "/sys", 4);
+-      path = end;
+-      rc = security_genfs_sid("proc", path, tclass, sid);
+-out_free:
++      path = sysctl_pathname(table, buffer, PAGE_SIZE);
++      if (path)
++              rc = security_genfs_sid("proc", path, tclass, sid);
+       free_page((unsigned long)buffer);
+ out:
+       return rc;