Merge tag 'i2c-for-6.4-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / kernel / umh.c

diff --git a/kernel/umh.c b/kernel/umh.c
index 2a47082773352e43b06e56d2b30a8280f5ceec46..60aa9e764a38f154b0adfeca24d6569f31a4ffa3 100644 (file)
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -32,9 +32,6 @@
 
 #include <trace/events/module.h>
 
-#define CAP_BSET       (void *)1
-#define CAP_PI         (void *)2
-
 static kernel_cap_t usermodehelper_bset = CAP_FULL_SET;
 static kernel_cap_t usermodehelper_inheritable = CAP_FULL_SET;
 static DEFINE_SPINLOCK(umh_sysctl_lock);
@@ -512,16 +509,11 @@ static int proc_cap_handler(struct ctl_table *table, int write,
        /*
         * convert from the global kernel_cap_t to the ulong array to print to
         * userspace if this is a read.
+        *
+        * Legacy format: capabilities are exposed as two 32-bit values
         */
+       cap = table->data;
        spin_lock(&umh_sysctl_lock);
-       if (table->data == CAP_BSET)
-               cap = &usermodehelper_bset;
-       else if (table->data == CAP_PI)
-               cap = &usermodehelper_inheritable;
-       else
-               BUG();
-
-       /* Legacy format: capabilities are exposed as two 32-bit values */
        cap_array[0] = (u32) cap->val;
        cap_array[1] = cap->val >> 32;
        spin_unlock(&umh_sysctl_lock);
@@ -555,14 +547,14 @@ static int proc_cap_handler(struct ctl_table *table, int write,
 struct ctl_table usermodehelper_table[] = {
        {
                .procname       = "bset",
-               .data           = CAP_BSET,
+               .data           = &usermodehelper_bset,
                .maxlen         = 2 * sizeof(unsigned long),
                .mode           = 0600,
                .proc_handler   = proc_cap_handler,
        },
        {
                .procname       = "inheritable",
-               .data           = CAP_PI,
+               .data           = &usermodehelper_inheritable,
                .maxlen         = 2 * sizeof(unsigned long),
                .mode           = 0600,
                .proc_handler   = proc_cap_handler,