diff options
author | Matt Wilson <msw@amazon.com> | 2013-09-06 12:52:04 -0700 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-10 10:54:34 +0100 |
commit | f949cbbeda5dea85810de9eee7613add709e9e91 (patch) | |
tree | ef6bcf11eb1c907657f7c66b8f904f8b8f8cb1db /extras/mini-os/pcifront.c | |
parent | de333b694591909787da54a40496fc82c8ba5b62 (diff) | |
download | xen-f949cbbeda5dea85810de9eee7613add709e9e91.tar.gz xen-f949cbbeda5dea85810de9eee7613add709e9e91.tar.bz2 xen-f949cbbeda5dea85810de9eee7613add709e9e91.zip |
minios: correct char array allocation for xenbus paths
The char arrays used to hold xenbus paths have historically been
allocated by manually counting the length longest string constants
included in constructing the path. This has led to improperly sized
buffers, both too large (with little consequence) and too small (which
obviously causes problems). This patch corrects the instances where
the length was incorrectly calculated by using strlen() on the longest
string constant used in building a xenbus path.
A follow-on clean-up patch will change all instances to use strlen().
Signed-off-by: Ben Cressey <bcressey@amazon.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-By: Samuel Thibault <samuel.thibault@ens-lyon.org>
[msw: split this patch from a larger patch from Ben, reworked to use
strlen()]
Signed-off-by: Matt Wilson <msw@amazon.com>
Diffstat (limited to 'extras/mini-os/pcifront.c')
-rw-r--r-- | extras/mini-os/pcifront.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index bbe21e0ae8..f9ae768170 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -323,7 +323,7 @@ void shutdown_pcifront(struct pcifront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; printk("close pci: backend at %s\n",dev->backend); @@ -379,7 +379,10 @@ int pcifront_physical_to_virtual (struct pcifront_dev *dev, unsigned int *slot, unsigned long *fun) { - char path[strlen(dev->backend) + 1 + 5 + 10 + 1]; + /* FIXME: the buffer sizing is a little lazy here. 10 extra bytes + should be enough to hold the paths we need to construct, even + if the number of devices is large */ + char path[strlen(dev->backend) + strlen("/num_devs") + 10 + 1]; int i, n; char *s, *msg = NULL; unsigned int dom1, bus1, slot1, fun1; |