cxl/region: uninitialized variable in alloc_hpa()
Subsystems (2)
PATCH 1/3 cxl/region: uninitialized variable in alloc_hpa()
This should check "p->res" instead of "res" (which is uninitialized).
--- drivers/cxl/core/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cxl/core/region.c +1 -1
@@ -454,7 +454,7 @@ static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size)lockdep_assert_held_write (&cxl_region_rwsem);/* Nothing to do... */ -if (p->res &&resource_size (res) == size) +if (p->res &&resource_size (p->res) == size)return 0 ;/* To change size the old size must be freed first */
Signature · 1 line
2.35.1
PATCH 2/3 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.
--- drivers/cxl/cxl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cxl/cxl.h +1 -1
@@ -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 ;
Signature · 1 line
2.35.1
RE: [PATCH 2/3] cxl/region: prevent underflow in ways_to_cxl()
Quoted 15 lines · Dan Carpenter
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 <[email protected]>--- drivers/cxl/cxl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/cxl/cxl.h +0
-0
drivers/cxl/cxl.h static inline int granularity_to_cxl(int g, u16 *ig) · line 108
Quoted 8 lines
drivers/cxl/cxl.h +1
-1@@ -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 ;
Looks good, I'll go ahead and update interleave_ways_store() to also not allow negative values.
PATCH 3/3 cxl/region: decrement ->nr_targets on error in cxl_region_attach()
In reply to Dan CarpenterThe ++ needs a match -- on the clean up path. If the p->nr_targets value gets to be more than 16 it leads to uninitialized data in cxl_port_setup_targets().
drivers/cxl/core/region.c:995 cxl_port_setup_targets() error: uninitialized symbol 'eiw'.
--- drivers/cxl/core/region.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/cxl/core/region.c +3 -1
@@ -1217,12 +1217,14 @@ static int cxl_region_attach(struct cxl_region *cxlr,if (p->nr_targets == p->interleave_ways) { rc =cxl_region_setup_targets (cxlr);if (rc) - goto err; + goto err_decrement; p->state =CXL_CONFIG_ACTIVE ; }return 0 ; +err_decrement: + p->nr_targets--; err:for (iter = ep_port; !is_cxl_root (iter); iter =to_cxl_port (iter->dev.parent))
Signature · 1 line
2.35.1
Re: [PATCH 3/3] cxl/region: decrement ->nr_targets on error in cxl_region_attach()
Quoted 8 lines · Dan Carpenter
The ++ needs a match -- on the clean up path. If the
p->nr_targetsvalue gets to be more than 16 it leads to uninitialized data incxl_port_setup_targets().
drivers/cxl/core/region.c:995cxl_port_setup_targets()error: uninitialized symbol 'eiw'.Fixes 27b3f8d13830 ("cxl/region: Program target lists")Signed-off-by Dan Carpenter <[email protected]>
The error handling in cxl_port_attach_region() looks like it might have a similar bug. The cxl_rr->nr_targets++; might want a --.
That function is more complicated.
drivers/cxl/core/region.c
740 static int cxl_port_attach_region(struct cxl_port *port,
741 struct cxl_region *cxlr,
742 struct cxl_endpoint_decoder *cxled, int pos)
743 {
744 struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); 745 struct cxl_ep *ep = cxl_ep_load(port, cxlmd); 746 struct cxl_region_ref *cxl_rr = NULL, *iter; 747 struct cxl_region_params *p = &cxlr->params; 748 struct cxl_decoder *cxld = NULL; 749 unsigned long index; 750 int rc = -EBUSY;
751
752 lockdep_assert_held_write(&cxl_region_rwsem);
753
754 xa_for_each(&port->regions, index, iter) {
755 struct cxl_region_params *ip = &iter->region->params;
756
757 if (iter->region == cxlr)
758 cxl_rr = iter;
Should there be a break statement after this assignment
759 if (ip->res->start > p->res->start) {or do we really want to test every ip->res->start? This loop is confusing...
760 dev_dbg(&cxlr->dev,
761 "%s: HPA order violation %s:%pr vs %pr\n",
762 dev_name(&port->dev),
763 dev_name(&iter->region->dev), ip->res, p->res);
764 return -EBUSY;
765 }
766 }
767
768 if (cxl_rr) {
769 struct cxl_ep *ep_iter;
770 int found = 0;
771
772 cxld = cxl_rr->decoder;
773 xa_for_each(&cxl_rr->endpoints, index, ep_iter) {regards,
dan carpenter
Re: [PATCH 3/3] cxl/region: decrement ->nr_targets on error in cxl_region_attach()
Quoted 36 lines · Dan Carpenter
Quoted 8 lines · Dan Carpenter
The ++ needs a match -- on the clean up path. If the
p->nr_targetsvalue gets to be more than 16 it leads to uninitialized data incxl_port_setup_targets().
drivers/cxl/core/region.c:995cxl_port_setup_targets()error: uninitialized symbol 'eiw'.Fixes 27b3f8d13830 ("cxl/region: Program target lists")Signed-off-by Dan Carpenter <[email protected]>The error handling in
cxl_port_attach_region()looks like it might have a similar bug. The cxl_rr->nr_targets++; might want a --.That function is more complicated.
drivers/cxl/core/region.c
740 static int cxl_port_attach_region(structcxl_port*port,
741 structcxl_region*cxlr,
742 structcxl_endpoint_decoder*cxled, int pos)743 { 744 struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); 745 struct cxl_ep *ep = cxl_ep_load(port, cxlmd); 746 struct cxl_region_ref *cxl_rr = NULL, *iter; 747 struct cxl_region_params *p = &cxlr->params; 748 struct cxl_decoder *cxld = NULL; 749 unsigned long index; 750 int rc = -EBUSY; 751 752 lockdep_assert_held_write(&cxl_region_rwsem); 753 754 xa_for_each(&port->regions, index, iter) { 755 struct cxl_region_params *ip = &iter->region->params; 756 757 if (iter->region == cxlr) 758 cxl_rr = iter;
Quoted 1 line
Should there be a break statement after this assignment
Indeed. If the port already has this region attached it means that it already passed this check previously.
Quoted 5 lines
759 if (ip->res->start > p->res->start) {or do we really want to test every
ip->res->start? This loop is confusing...
Let me take a shot at reflowing this whole routine to make it less confusing.
RE: [PATCH 3/3] cxl/region: decrement ->nr_targets on error in cxl_region_attach()
In reply to Dan CarpenterQuoted 19 lines · Dan Carpenter
The ++ needs a match -- on the clean up path. If the
p->nr_targetsvalue gets to be more than 16 it leads to uninitialized data incxl_port_setup_targets().
drivers/cxl/core/region.c:995cxl_port_setup_targets()error: uninitialized symbol 'eiw'.Fixes 27b3f8d13830 ("cxl/region: Program target lists")Signed-off-by Dan Carpenter <[email protected]>--- drivers/cxl/core/region.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/cxl/core/region.c +0
-0@@ -1217,12 +1217,14 @@ static int cxl_region_attach(struct cxl_region *cxlr,if (p->nr_targets == p->interleave_ways) { rc =cxl_region_setup_targets (cxlr);
drivers/cxl/core/region.c static int cxl_region_attach(struct cxl_region *cxlr, · line 1227
Quoted 10 lines
drivers/cxl/core/region.c +3
-1if (rc) - goto err; + goto err_decrement; p->state =CXL_CONFIG_ACTIVE ; }return 0 ; +err_decrement: + p->nr_targets--;
Yes, looks good.
Quoted 13 lines · Dan Carpenter
This should check "
p->res" instead of "res" (which is uninitialized).Fixes 23a22cd1c98b ("cxl/region: Allocate HPA capacity to regions")Signed-off-by Dan Carpenter <[email protected]>--- drivers/cxl/core/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/cxl/core/region.c +0
-0
drivers/cxl/core/region.c static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size) · line 457
Quoted 5 lines
drivers/cxl/core/region.c +1
-1@@ -454,7 +454,7 @@ static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size)lockdep_assert_held_write (&cxl_region_rwsem);/* Nothing to do... */ -if (p->res &&resource_size (res) == size) +if (p->res &&resource_size (p->res) == size)
Yup, looks good. Surprised this was not caught by my local compiler, or any of the compile-test robots.
Quoted 16 lines · Dan Williams
Quoted 15 lines · Dan Carpenter
This should check "
p->res" instead of "res" (which is uninitialized).Fixes 23a22cd1c98b ("cxl/region: Allocate HPA capacity to regions")Signed-off-by Dan Carpenter <[email protected]>--- drivers/cxl/core/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/cxl/core/region.c +0
-0@@ -454,7 +454,7 @@ static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size)lockdep_assert_held_write (&cxl_region_rwsem);
Quoted 6 lines
drivers/cxl/core/region.c static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size) · line 457
Quoted 3 lines
drivers/cxl/core/region.c +1
-1/* Nothing to do... */ -if (p->res &&resource_size (res) == size) +if (p->res &&resource_size (p->res) == size)Yup, looks good. Surprised this was not caught by my local compiler, or any of the compile-test robots.
Yeah. It's weird.
We've disabled GCC uninitialized warnings which made me introduce a bug last week... But normally the Clang people and the kbuild bots fix the bugs before I do.
regards,
dan carpenter