apparmor-05-nick-kvfree-from-apparmor.patch

   1 From 39f1f78d53b9bcbca91967380c5f0f2305a5c55f Mon Sep 17 00:00:00 2001
   2 From: Al Viro <viro@zeniv.linux.org.uk>
   3 Date: Tue, 6 May 2014 14:02:53 -0400
   4 Subject: nick kvfree() from apparmor
   5
   6 too many places open-code it
   7
   8 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
   9
  10 diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h
  11 index 8fb1488..97130f8 100644
  12 --- a/security/apparmor/include/apparmor.h
  13 +++ b/security/apparmor/include/apparmor.h
  14 @@ -66,7 +66,6 @@ extern int apparmor_initialized __initdata;
  15  char *aa_split_fqname(char *args, char **ns_name);
  16  void aa_info_message(const char *str);
  17  void *__aa_kvmalloc(size_t size, gfp_t flags);
  18 -void kvfree(void *buffer);
  19
  20  static inline void *kvmalloc(size_t size)
  21  {
  22 diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
  23 index 6968992..c1827e0 100644
  24 --- a/security/apparmor/lib.c
  25 +++ b/security/apparmor/lib.c
  26 @@ -104,17 +104,3 @@ void *__aa_kvmalloc(size_t size, gfp_t flags)
  27         }
  28         return buffer;
  29  }
  30 -
  31 -/**
  32 - * kvfree - free an allocation do by kvmalloc
  33 - * @buffer: buffer to free (MAYBE_NULL)
  34 - *
  35 - * Free a buffer allocated by kvmalloc
  36 - */
  37 -void kvfree(void *buffer)
  38 -{
  39 -       if (is_vmalloc_addr(buffer))
  40 -               vfree(buffer);
  41 -       else
  42 -               kfree(buffer);
  43 -}
  44 --
  45 cgit v0.10.2
  46