logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0004-Use-external-string-to-cap-function.patch (2145B)

    

  1. From 1939348d3a1e8238464cd4c52743b04fa52ebed1 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Tue, 4 Jul 2023 19:20:51 -0700
  4. Subject: [PATCH] Use external string-to-cap function
  6. ---
  7.  bubblewrap.c | 15 ++++++++++-----
  8.  1 file changed, 10 insertions(+), 5 deletions(-)
  10. diff --git a/bubblewrap.c b/bubblewrap.c
  11. index 608009d..71c8bd0 100644
  12. --- a/bubblewrap.c
  13. +++ b/bubblewrap.c
  14. @@ -30,8 +30,8 @@
  15.  #include <sys/eventfd.h>
  16.  #include <sys/fsuid.h>
  17.  #include <sys/signalfd.h>
  18. -#include <sys/capability.h>
  19.  #include <sys/prctl.h>
  20. +#include <linux/capability.h>
  21.  #include <linux/sched.h>
  22.  #include <linux/seccomp.h>
  23.  #include <linux/filter.h>
  24. @@ -44,6 +44,9 @@
  25.  #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
  26.  #endif
  27.  
  28. +int capset(void *, void *);
  29. +int capget(void *, void *);
  30. +int cap_from_name(const char *);
  31.  
  32.  /* We limit the size of a tmpfs to half the architecture's address space,
  33.   * to avoid hitting arbitrary limits in the kernel.
  34. @@ -2358,7 +2361,7 @@ parse_args_recurse (int          *argcp,
  35.          }
  36.        else if (strcmp (arg, "--cap-add") == 0)
  37.          {
  38. -          cap_value_t cap;
  39. +          int cap;
  40.            if (argc < 2)
  41.              die ("--cap-add takes an argument");
  42.  
  43. @@ -2370,7 +2373,8 @@ parse_args_recurse (int          *argcp,
  44.              }
  45.            else
  46.              {
  47. -              if (cap_from_name (argv[1], &cap) < 0)
  48. +              cap = cap_from_name (argv[1]);
  49. +              if (cap < 0)
  50.                  die ("unknown cap: %s", argv[1]);
  51.  
  52.                if (cap < 32)
  53. @@ -2384,7 +2388,7 @@ parse_args_recurse (int          *argcp,
  54.          }
  55.        else if (strcmp (arg, "--cap-drop") == 0)
  56.          {
  57. -          cap_value_t cap;
  58. +          int cap;
  59.            if (argc < 2)
  60.              die ("--cap-drop takes an argument");
  61.  
  62. @@ -2396,7 +2400,8 @@ parse_args_recurse (int          *argcp,
  63.              }
  64.            else
  65.              {
  66. -              if (cap_from_name (argv[1], &cap) < 0)
  67. +              cap = cap_from_name (argv[1]);
  68. +              if (cap < 0)
  69.                  die ("unknown cap: %s", argv[1]);
  70.  
  71.                if (cap < 32)
  72. -- 
  73. 2.37.3