aboutsummaryrefslogtreecommitdiffstats
path: root/0003-Make-static-usermode-helper-binaries-constant.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-12-11 18:15:35 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-12-11 18:15:35 +0100
commit22276c57445de5b29e143affdabe72576ab8dce3 (patch)
tree14754e08a6fafa472065b31afe5123c47281bb58 /0003-Make-static-usermode-helper-binaries-constant.patch
parent946cb48082b0bbff0bb96b3f816d0327bf409d79 (diff)
downloadpatches-22276c57445de5b29e143affdabe72576ab8dce3.tar.gz
usermode helper patches added
Diffstat (limited to '0003-Make-static-usermode-helper-binaries-constant.patch')
-rw-r--r--0003-Make-static-usermode-helper-binaries-constant.patch181
1 files changed, 181 insertions, 0 deletions
diff --git a/0003-Make-static-usermode-helper-binaries-constant.patch b/0003-Make-static-usermode-helper-binaries-constant.patch
new file mode 100644
index 00000000000000..53ad93571e77e5
--- /dev/null
+++ b/0003-Make-static-usermode-helper-binaries-constant.patch
@@ -0,0 +1,181 @@
+From b8cc8ef7094cbaf916b87573efa3c31727bd6b2d Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sun, 11 Dec 2016 18:00:43 +0100
+Subject: [PATCH 3/4] Make static usermode helper binaries constant
+
+There are a number of usermode helper binaries that are "hard coded" in
+the kernel today, so mark them as "const" to make it harder for someone
+to change where the variables point to.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/macintosh/windfarm_core.c | 2 +-
+ drivers/net/hamradio/baycom_epp.c | 2 +-
+ drivers/pnp/pnpbios/core.c | 5 +++--
+ drivers/staging/greybus/svc_watchdog.c | 4 ++--
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 6 +++---
+ fs/nfsd/nfs4layouts.c | 6 ++++--
+ security/keys/request_key.c | 7 ++++---
+ 7 files changed, 18 insertions(+), 14 deletions(-)
+
+--- a/drivers/macintosh/windfarm_core.c
++++ b/drivers/macintosh/windfarm_core.c
+@@ -74,7 +74,7 @@ static inline void wf_notify(int event,
+
+ static int wf_critical_overtemp(void)
+ {
+- static char * critical_overtemp_path = "/sbin/critical_overtemp";
++ static const char * critical_overtemp_path = "/sbin/critical_overtemp";
+ char *argv[] = { critical_overtemp_path, NULL };
+ static char *envp[] = { "HOME=/",
+ "TERM=linux",
+--- a/drivers/net/hamradio/baycom_epp.c
++++ b/drivers/net/hamradio/baycom_epp.c
+@@ -299,7 +299,7 @@ static inline void baycom_int_freq(struc
+ * eppconfig_path should be setable via /proc/sys.
+ */
+
+-static char eppconfig_path[256] = "/usr/sbin/eppfpga";
++static const char eppconfig_path[256] = "/usr/sbin/eppfpga";
+
+ static char *envp[] = { "HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL };
+
+--- a/drivers/pnp/pnpbios/core.c
++++ b/drivers/pnp/pnpbios/core.c
+@@ -98,6 +98,7 @@ static struct completion unload_sem;
+ */
+ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
+ {
++ static const char *sbin_pnpbios = "/sbin/pnpbios";
+ char *argv[3], **envp, *buf, *scratch;
+ int i = 0, value;
+
+@@ -112,7 +113,7 @@ static int pnp_dock_event(int dock, stru
+ * integrated into the driver core and use the usual infrastructure
+ * like sysfs and uevents
+ */
+- argv[0] = "/sbin/pnpbios";
++ argv[0] = sbin_pnpbios;
+ argv[1] = "dock";
+ argv[2] = NULL;
+
+@@ -139,7 +140,7 @@ static int pnp_dock_event(int dock, stru
+ info->location_id, info->serial, info->capabilities);
+ envp[i] = NULL;
+
+- value = call_usermodehelper(argv [0], argv, envp, UMH_WAIT_EXEC);
++ value = call_usermodehelper(sbin_pnpbios, argv, envp, UMH_WAIT_EXEC);
+ kfree(buf);
+ kfree(envp);
+ return 0;
+--- a/drivers/staging/greybus/svc_watchdog.c
++++ b/drivers/staging/greybus/svc_watchdog.c
+@@ -44,14 +44,14 @@ static int svc_watchdog_pm_notifier(stru
+
+ static void greybus_reset(struct work_struct *work)
+ {
+- static char start_path[256] = "/system/bin/start";
++ static const char start_path[256] = "/system/bin/start";
+ static char *envp[] = {
+ "HOME=/",
+ "PATH=/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin",
+ NULL,
+ };
+ static char *argv[] = {
+- start_path,
++ (char *)start_path,
+ "unipro_reset",
+ NULL,
+ };
+--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
++++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+@@ -268,7 +268,7 @@ void rtl92e_dm_watchdog(struct net_devic
+ static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev)
+ {
+ struct r8192_priv *priv = rtllib_priv(dev);
+- static char *ac_dc_script = "/etc/acpi/wireless-rtl-ac-dc-power.sh";
++ static const char *ac_dc_script = "/etc/acpi/wireless-rtl-ac-dc-power.sh";
+ char *argv[] = {ac_dc_script, DRV_NAME, NULL};
+ static char *envp[] = {"HOME=/",
+ "TERM=linux",
+@@ -1823,7 +1823,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpi
+ enum rt_rf_power_state eRfPowerStateToSet;
+ bool bActuallySet = false;
+ char *argv[3];
+- static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh";
++ static const char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh";
+ static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin",
+ NULL};
+
+@@ -1862,7 +1862,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpi
+ else
+ argv[1] = "RFON";
+
+- argv[0] = RadioPowerPath;
++ argv[0] = (char *)RadioPowerPath;
+ argv[2] = NULL;
+ call_usermodehelper(RadioPowerPath, argv, envp, UMH_WAIT_PROC);
+ }
+--- a/fs/nfsd/nfs4layouts.c
++++ b/fs/nfsd/nfs4layouts.c
+@@ -613,6 +613,7 @@ nfsd4_cb_layout_fail(struct nfs4_layout_
+ {
+ struct nfs4_client *clp = ls->ls_stid.sc_client;
+ char addr_str[INET6_ADDRSTRLEN];
++ static const char *nfsd_recall_failed = "/sbin/nfsd-recall-failed";
+ static char *envp[] = {
+ "HOME=/",
+ "TERM=linux",
+@@ -628,12 +629,13 @@ nfsd4_cb_layout_fail(struct nfs4_layout_
+ "nfsd: client %s failed to respond to layout recall. "
+ " Fencing..\n", addr_str);
+
+- argv[0] = "/sbin/nfsd-recall-failed";
++ argv[0] = (char *)nfsd_recall_failed;
+ argv[1] = addr_str;
+ argv[2] = ls->ls_file->f_path.mnt->mnt_sb->s_id;
+ argv[3] = NULL;
+
+- error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
++ error = call_usermodehelper(nfsd_recall_failed, argv, envp,
++ UMH_WAIT_PROC);
+ if (error) {
+ printk(KERN_ERR "nfsd: fence failed for client %s: %d!\n",
+ addr_str, error);
+--- a/security/keys/request_key.c
++++ b/security/keys/request_key.c
+@@ -72,7 +72,7 @@ static void umh_keys_cleanup(struct subp
+ /*
+ * Call a usermode helper with a specific session keyring.
+ */
+-static int call_usermodehelper_keys(char *path, char **argv, char **envp,
++static int call_usermodehelper_keys(const char *path, char **argv, char **envp,
+ struct key *session_keyring, int wait)
+ {
+ struct subprocess_info *info;
+@@ -95,6 +95,7 @@ static int call_sbin_request_key(struct
+ const char *op,
+ void *aux)
+ {
++ static const char *request_key = "/sbin/request-key";
+ const struct cred *cred = current_cred();
+ key_serial_t prkey, sskey;
+ struct key *key = cons->key, *authkey = cons->authkey, *keyring,
+@@ -161,7 +162,7 @@ static int call_sbin_request_key(struct
+
+ /* set up the argument list */
+ i = 0;
+- argv[i++] = "/sbin/request-key";
++ argv[i++] = (char *)request_key;
+ argv[i++] = (char *) op;
+ argv[i++] = key_str;
+ argv[i++] = uid_str;
+@@ -172,7 +173,7 @@ static int call_sbin_request_key(struct
+ argv[i] = NULL;
+
+ /* do it */
+- ret = call_usermodehelper_keys(argv[0], argv, envp, keyring,
++ ret = call_usermodehelper_keys(request_key, argv, envp, keyring,
+ UMH_WAIT_PROC);
+ kdebug("usermode -> 0x%x", ret);
+ if (ret >= 0) {
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:23:36 +0000