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 (2146B)

    

  1. From b7a6ea17d3ba3a271b475da6f8a419e55ffb7310 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  | 6 +++---
  8.  lib/sysfs.c | 2 +-
  9.  ls-kernel.c | 2 +-
  10.  3 files changed, 5 insertions(+), 5 deletions(-)
  12. diff --git a/lib/dump.c b/lib/dump.c
  13. index 59cf7ed..778d2ec 100644
  14. --- a/lib/dump.c
  15. +++ b/lib/dump.c
  16. @@ -60,7 +60,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. @@ -79,8 +79,8 @@ 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. +      if (dump_validate(buf, "##:##.# ") && sscanf(buf, "%x:%x.%u", &bn, &dn, &fn) == 3 ||
  32. +	  dump_validate(buf, "####:##:##.# ") && sscanf(buf, "%x:%x:%x.%u", &mn, &bn, &dn, &fn) == 4)
  33.  	{
  34.  	  dev = pci_get_dev(a, mn, bn, dn, fn);
  35.  	  dump_alloc_data(dev, 256);
  36. diff --git a/lib/sysfs.c b/lib/sysfs.c
  37. index fb64241..df39b36 100644
  38. --- a/lib/sysfs.c
  39. +++ b/lib/sysfs.c
  40. @@ -212,7 +212,7 @@ static void sysfs_scan(struct pci_access *a)
  41.  	continue;
  42.  
  43.        d = pci_alloc_dev(a);
  44. -      if (sscanf(entry->d_name, "%x:%x:%x.%d", &dom, &bus, &dev, &func) < 4)
  45. +      if (sscanf(entry->d_name, "%x:%x:%x.%u", &dom, &bus, &dev, &func) < 4)
  46.  	a->error("sysfs_scan: Couldn't parse entry name %s", entry->d_name);
  47.  
  48.        /* Ensure kernel provided domain that fits in a signed integer */
  49. diff --git a/ls-kernel.c b/ls-kernel.c
  50. index ecacd0e..4199402 100644
  51. --- a/ls-kernel.c
  52. +++ b/ls-kernel.c
  53. @@ -156,7 +156,7 @@ show_kernel_init(void)
  54.        *c++ = 0;
  55.  
  56.        e = xmalloc(sizeof(*e) + strlen(line));
  57. -      if (sscanf(c, "%i%i%i%i%i%i",
  58. +      if (sscanf(c, "%u%u%u%u%u%u",
  59.  		 &e->vendor, &e->device,
  60.  		 &e->subvendor, &e->subdevice,
  61.  		 &e->class, &e->class_mask) != 6)
  62. -- 
  63. 2.28.0