On Mon, Feb 12, 2018 at 04:04:57PM -0700, Kenny Ballou wrote: > Convert ROM read access enable/disable string parsing to use the > `kstrtobool` function. > > This fixes Bugzilla Bug 111301 -- Sysfs PCI rom file functionality does > not match documentation. > > bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=111301 > > Reported-by: googlegot@xxxxxxxxx > Signed-off-by: Kenny Ballou <kballou@xxxxxxxxxxxxxx> > --- > drivers/pci/pci-sysfs.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index eb6bee8724cc..3cde1f25e786 100644 > --- a/drivers/pci/pci-sysfs.c > +++ b/drivers/pci/pci-sysfs.c > @@ -1424,10 +1424,12 @@ static ssize_t pci_write_rom(struct file *filp, struct kobject *kobj, > { > struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj)); > > - if ((off == 0) && (*buf == '0') && (count == 2)) > - pdev->rom_attr_enabled = 0; > - else > + bool res = false; > + > + if (kstrtobool(buf, &res) == 0 && res) > pdev->rom_attr_enabled = 1; > + else > + pdev->rom_attr_enabled = 0; > > return count; > } I know I proposed kstrtobool(). But looking closer, I don't think it's the right answer because: - kstrtobool() assumes a NULL-terminated string, and sysfs does not guarantee that. This is a binary file and we can write arbitrary data to it. kstrtobool_from_user() makes sure the string is NULL-terminated, but it does a copy_from_user() that we don't want in the sysfs case. - The current behavior is that only 2-byte writes starting with '0' disable the ROM, and all other writes enable it. Using kstrtobool() would enable the ROM only for writes starting with y/Y/1/on/oN/On/ON, and all other writes would disable it. That changes the behavior for most writes, e.g., writing "2" currently enables, but would now disable. This feels unnecessarily risky because we don't know what programs are writing to enable the ROM. The doc says to write "1", but the code comment says "anything except 0". We *could* change the code to accept a single-byte '0' write, but I think the simplest solution would be to change the documentation to explicitly require a 2-byte "0\n" write to disable the ROM. Sorry for dithering on this. Bjorn
