logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0002-Fix-pointer-type-of-sscanf-arguments.patch (3087B)

    

  1. From 1419e1101d2420db610a98a83bd41f0535ed70cb Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sun, 16 Aug 2020 16:23:10 -0700
  4. Subject: [PATCH] Fix pointer type of sscanf arguments
  6. ---
  7.  lib/dump.c  | 10 +++++-----
  8.  lib/sysfs.c |  4 ++--
  9.  ls-kernel.c |  2 +-
  10.  3 files changed, 8 insertions(+), 8 deletions(-)
  12. diff --git a/lib/dump.c b/lib/dump.c
  13. index 00ebc9e..59af0a1 100644
  14. --- a/lib/dump.c
  15. +++ b/lib/dump.c
  16. @@ -62,7 +62,7 @@ dump_init(struct pci_access *a)
  17.    FILE *f;
  18.    char buf[256];
  19.    struct pci_dev *dev = NULL;
  20. -  int len, mn, bn, dn, fn, i, j;
  21. +  unsigned int len, mn, bn, dn, fn, i, j;
  22.  
  23.    if (!name)
  24.      a->error("dump: File name not given.");
  25. @@ -81,10 +81,10 @@ dump_init(struct pci_access *a)
  26.  	*z-- = 0;
  27.        len = z - buf + 1;
  28.        mn = 0;
  29. -      if (dump_validate(buf, "##:##.# ") && sscanf(buf, "%x:%x.%d", &bn, &dn, &fn) == 3 ||
  30. -	  dump_validate(buf, "####:##:##.# ") && sscanf(buf, "%x:%x:%x.%d", &mn, &bn, &dn, &fn) == 4 ||
  31. -	  dump_validate(buf, "#####:##:##.# ") && sscanf(buf, "%x:%x:%x.%d", &mn, &bn, &dn, &fn) == 4 ||
  32. -	  dump_validate(buf, "######:##:##.# ") && sscanf(buf, "%x:%x:%x.%d", &mn, &bn, &dn, &fn) == 4)
  33. +      if (dump_validate(buf, "##:##.# ") && sscanf(buf, "%x:%x.%u", &bn, &dn, &fn) == 3 ||
  34. +	  dump_validate(buf, "####:##:##.# ") && sscanf(buf, "%x:%x:%x.%u", &mn, &bn, &dn, &fn) == 4 ||
  35. +	  dump_validate(buf, "#####:##:##.# ") && sscanf(buf, "%x:%x:%x.%u", &mn, &bn, &dn, &fn) == 4 ||
  36. +	  dump_validate(buf, "######:##:##.# ") && sscanf(buf, "%x:%x:%x.%u", &mn, &bn, &dn, &fn) == 4)
  37.  	{
  38.  	  dev = pci_get_dev(a, mn, bn, dn, fn);
  39.  	  dump_alloc_data(dev, 256);
  40. diff --git a/lib/sysfs.c b/lib/sysfs.c
  41. index 7dedc0b..4f5c003 100644
  42. --- a/lib/sysfs.c
  43. +++ b/lib/sysfs.c
  44. @@ -257,7 +257,7 @@ static void sysfs_scan(struct pci_access *a)
  45.  	continue;
  46.  
  47.        d = pci_alloc_dev(a);
  48. -      if (sscanf(entry->d_name, "%x:%x:%x.%d", &dom, &bus, &dev, &func) < 4)
  49. +      if (sscanf(entry->d_name, "%x:%x:%x.%u", &dom, &bus, &dev, &func) < 4)
  50.  	a->error("sysfs_scan: Couldn't parse entry name %s", entry->d_name);
  51.  
  52.        /* Ensure kernel provided domain that fits in a signed integer */
  53. @@ -398,7 +398,7 @@ sysfs_fill_info(struct pci_dev *d, unsigned int flags)
  54.  	  name = name ? name+1 : name;
  55.  	  parent = NULL;
  56.  
  57. -	  if (name && sscanf(name, "%x:%x:%x.%d", &domain, &bus, &dev, &func) == 4 && domain <= 0x7fffffff)
  58. +	  if (name && sscanf(name, "%x:%x:%x.%u", &domain, &bus, &dev, &func) == 4 && domain <= 0x7fffffff)
  59.  	    for (parent = d->access->devices; parent; parent = parent->next)
  60.  	      if (parent->domain == (int)domain && parent->bus == bus && parent->dev == dev && parent->func == func)
  61.  	        break;
  62. diff --git a/ls-kernel.c b/ls-kernel.c
  63. index c939c52..13b29f7 100644
  64. --- a/ls-kernel.c
  65. +++ b/ls-kernel.c
  66. @@ -157,7 +157,7 @@ show_kernel_init(void)
  67.        *c++ = 0;
  68.  
  69.        e = xmalloc(sizeof(*e) + strlen(line));
  70. -      if (sscanf(c, "%i%i%i%i%i%i",
  71. +      if (sscanf(c, "%u%u%u%u%u%u",
  72.  		 &e->vendor, &e->device,
  73.  		 &e->subvendor, &e->subdevice,
  74.  		 &e->class, &e->class_mask) != 6)
  75. -- 
  76. 2.49.0