From 084e5a86e5eca77cec49e08e0d83fe8266eca91b Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 3 Nov 2019 17:45:46 +0100 Subject: pci-arbiter Revert snprintf truncation change snprintf guarantees to add a trailing \0, so there is no need to add one * pci-arbiter/pcifs.c (create_fs_tree): Give whole buffer to snprintf. --- pci-arbiter/pcifs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pci-arbiter/pcifs.c') diff --git a/pci-arbiter/pcifs.c b/pci-arbiter/pcifs.c index ba5cf427..3bf255bc 100644 --- a/pci-arbiter/pcifs.c +++ b/pci-arbiter/pcifs.c @@ -198,7 +198,7 @@ create_fs_tree (struct pcifs * fs, struct pci_system * pci_sys) e_stat = list->stat; e_stat.st_mode &= ~S_IROOT; /* Remove the root mode */ memset (entry_name, 0, NAME_SIZE); - snprintf (entry_name, NAME_SIZE - 1, "%04x", device->domain); + snprintf (entry_name, NAME_SIZE, "%04x", device->domain); err = create_dir_entry (device->domain, -1, -1, -1, -1, entry_name, list, e_stat, 0, 0, e); @@ -216,7 +216,7 @@ create_fs_tree (struct pcifs * fs, struct pci_system * pci_sys) { /* We've found a new bus. Add an entry for it */ memset (entry_name, 0, NAME_SIZE); - snprintf (entry_name, NAME_SIZE - 1, "%02x", device->bus); + snprintf (entry_name, NAME_SIZE, "%02x", device->bus); err = create_dir_entry (device->domain, device->bus, -1, -1, -1, entry_name, domain_parent, domain_parent->stat, @@ -234,7 +234,7 @@ create_fs_tree (struct pcifs * fs, struct pci_system * pci_sys) { /* We've found a new dev. Add an entry for it */ memset (entry_name, 0, NAME_SIZE); - snprintf (entry_name, NAME_SIZE - 1, "%02x", device->dev); + snprintf (entry_name, NAME_SIZE, "%02x", device->dev); err = create_dir_entry (device->domain, device->bus, device->dev, -1, -1, entry_name, bus_parent, bus_parent->stat, 0, @@ -253,7 +253,7 @@ create_fs_tree (struct pcifs * fs, struct pci_system * pci_sys) /* Add func entry */ memset (entry_name, 0, NAME_SIZE); - snprintf (entry_name, NAME_SIZE - 1, "%01u", device->func); + snprintf (entry_name, NAME_SIZE, "%01u", device->func); err = create_dir_entry (device->domain, device->bus, device->dev, device->func, device->device_class, entry_name, @@ -285,7 +285,7 @@ create_fs_tree (struct pcifs * fs, struct pci_system * pci_sys) if (device->regions[j].size > 0) { e_stat.st_size = device->regions[j].size; - snprintf (entry_name, NAME_SIZE - 1, "%s%01u", FILE_REGION_NAME, j); + snprintf (entry_name, NAME_SIZE, "%s%01u", FILE_REGION_NAME, j); err = create_dir_entry (device->domain, device->bus, device->dev, device->func, device->device_class, -- cgit v1.2.3