Merge tag 'cxl-fixes-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl

torvalds · torvalds · commit 533c54547153 · 2023-05-14T12:32:34.000-07:00
Pull compute express link fixes from Dan Williams:

 - Fix a compilation issue with DEFINE_STATIC_SRCU() in the unit tests

 - Fix leaking kernel memory to a root-only sysfs attribute

* tag 'cxl-fixes-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl:
  cxl: Add missing return to cdat read error path
  tools/testing/cxl: Use DEFINE_STATIC_SRCU()
diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c
@@ -571,6 +571,7 @@ void read_cdat_data(struct cxl_port *port)
 		/* Don't leave table data allocated on error */
 		devm_kfree(dev, cdat_table);
 		dev_err(dev, "CDAT data read error\n");
+		return;
 	}
 
 	port->cdat.table = cdat_table + sizeof(__le32);
diff --git a/tools/testing/cxl/test/mock.c b/tools/testing/cxl/test/mock.c
@@ -19,7 +19,7 @@ void register_cxl_mock_ops(struct cxl_mock_ops *ops)
 }
 EXPORT_SYMBOL_GPL(register_cxl_mock_ops);
 
-static DEFINE_SRCU(cxl_mock_srcu);
+DEFINE_STATIC_SRCU(cxl_mock_srcu);
 
 void unregister_cxl_mock_ops(struct cxl_mock_ops *ops)
 {

Original file line number	Diff line number	Diff line change
`@@ -571,6 +571,7 @@ void read_cdat_data(struct cxl_port *port)`
`571`	`571`	`/* Don't leave table data allocated on error */`
`572`	`572`	`devm_kfree(dev, cdat_table);`
`573`	`573`	`dev_err(dev, "CDAT data read error\n");`
	`574`	`+ return;`
`574`	`575`	`}`
`575`	`576`
`576`	`577`	`port->cdat.table = cdat_table + sizeof(__le32);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void register_cxl_mock_ops(struct cxl_mock_ops *ops)`
`19`	`19`	`}`
`20`	`20`	`EXPORT_SYMBOL_GPL(register_cxl_mock_ops);`
`21`	`21`
`22`		`-static DEFINE_SRCU(cxl_mock_srcu);`
	`22`	`+DEFINE_STATIC_SRCU(cxl_mock_srcu);`
`23`	`23`
`24`	`24`	`void unregister_cxl_mock_ops(struct cxl_mock_ops *ops)`
`25`	`25`	`{`