Skip to contentSkip to conversation

Patch "xen-pciback: Add name prefix to global 'permissive' variable" has been added to the 4.0-stable tree

PATCH [email protected] 1 participant 1 message May 15, 2015

Subsystems (2)
Stable branch Xen hypervisor interface
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

xen-pciback: Add name prefix to global 'permissive' variable

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xen-pciback-add-name-prefix-to-global-permissive-variable.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8014bcc86ef112eab9ee1db312dba4e6b608cf89 Mon Sep 17 00:00:00 2001

From: Ben Hutchings <[email protected]>
Date: Mon, 13 Apr 2015 00:26:35 +0100
Subject: xen-pciback: Add name prefix to global 'permissive' variable

From: Ben Hutchings <[email protected]>

commit 8014bcc86ef112eab9ee1db312dba4e6b608cf89 upstream.

The variable for the 'permissive' module parameter used to be static but was recently changed to be extern. This puts it in the kernel global namespace if the driver is built-in, so its name should begin with a prefix identifying the driver.

Signed-off-by Ben Hutchings <[email protected]>
Fixes af6fc858a35b ("xen-pciback: limit guest control of command register")
Signed-off-by David Vrabel <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/xen/xen-pciback/conf_space.c        |    6 +++---
 drivers/xen/xen-pciback/conf_space.h        |    2 +-
 drivers/xen/xen-pciback/conf_space_header.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/xen/xen-pciback/conf_space.c +3 -3
@@ -16,8 +16,8 @@
 #include "conf_space.h"
 #include "conf_space_quirks.h"
 
-bool permissive;
-module_param(permissive, bool, 0644);
+bool xen_pcibk_permissive;
+module_param_named(permissive, xen_pcibk_permissive, bool, 0644);
 
 /* This is where xen_pcibk_read_config_byte, xen_pcibk_read_config_word,
  * xen_pcibk_write_config_word, and xen_pcibk_write_config_byte are created. */

@@ -262,7 +262,7 @@ int xen_pcibk_config_write(struct pci_de
 		 * This means that some fields may still be read-only because
 		 * they have entries in the config_field list that intercept
 		 * the write and do nothing. */
-		if (dev_data->permissive || permissive) {
+		if (dev_data->permissive || xen_pcibk_permissive) {
 			switch (size) {
 			case 1:
 				err = pci_write_config_byte(dev, offset,
drivers/xen/xen-pciback/conf_space.h +1 -1
@@ -64,7 +64,7 @@ struct config_field_entry {
 	void *data;
 };
 
-extern bool permissive;
+extern bool xen_pcibk_permissive;
 
 #define OFFSET(cfg_entry) ((cfg_entry)->base_offset+(cfg_entry)->field->offset)
drivers/xen/xen-pciback/conf_space_header.c +1 -1
@@ -105,7 +105,7 @@ static int command_write(struct pci_dev
 
 	cmd->val = value;
 
-	if (!permissive && (!dev_data || !dev_data->permissive))
+	if (!xen_pcibk_permissive && (!dev_data || !dev_data->permissive))
 		return 0;
 
 	/* Only allow the guest to control certain bits. */

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/xen-pciback-add-name-prefix-to-global-permissive-variable.patch