cxl/region: prevent underflow in ways_to_cxl()

The "ways" variable comes from the user.  The ways_to_cxl() function
has an upper bound but it doesn't check for negatives.  Make
the "ways" variable an unsigned int to fix this bug.

Fixes: 80d10a6cee05 ("cxl/region: Add interleave geometry attributes")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/Yueo3NV2hFCXx1iV@kili
[djbw: fixup interleave_ways_store() to only accept unsigned input]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
index c80932bca6678ebf1d0e0a66278d1c48f7a08546..516ba7e2de81aa3217cd7978c94b3ee1ad31a8b6 100644 (file)
--- a/drivers/cxl/core/region.c
+++ b/drivers/cxl/core/region.c
@@ -319,10 +319,11 @@ static ssize_t interleave_ways_store(struct device *dev,
        struct cxl_decoder *cxld = &cxlrd->cxlsd.cxld;
        struct cxl_region *cxlr = to_cxl_region(dev);
        struct cxl_region_params *p = &cxlr->params;
-       int rc, val, save;
+       unsigned int val, save;
+       int rc;
        u8 iw;
 
-       rc = kstrtoint(buf, 0, &val);
+       rc = kstrtouint(buf, 0, &val);
        if (rc)
                return rc;
 

diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
index 75674400cc8d41ad44c970d6fafbd8e67d8f3ef6..969953ce2609a9e1a636cfd73cc50749ad1d75ad 100644 (file)
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
@@ -102,7 +102,7 @@ static inline int granularity_to_cxl(int g, u16 *ig)
        return 0;
 }
 
-static inline int ways_to_cxl(int ways, u8 *iw)
+static inline int ways_to_cxl(unsigned int ways, u8 *iw)
 {
        if (ways > 16)
                return -EINVAL;