OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cxl fixes for v6.4-rc2 

- Fix a compilation issue with DEFINE_STATIC_SRCU() in the unit tests
 
 - Fix leaking kernel memory to a root-only sysfs attribute
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQSbo+XnGs+rwLz9XGXfioYZHlFsZwUCZGETgQAKCRDfioYZHlFs
 Zy+FAQDDwPDprMrALvuWz3rYPROPH0h6X2zLYH5JFq29cqjO9wD/RVlrXFFkGaG+
 3n7Uip2rZaW3OpC2TOaqBaDxTkXo0ww=
 =yFDG
 -----END PGP SIGNATURE-----

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

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()
This commit is contained in:
Linus Torvalds 2023-05-14 12:32:34 -07:00
parent 838a854820 764d102ef9
commit 533c545471
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/cxl/core/pci.c
View File

@ -571,6 +571,7 @@ void read_cdat_data(struct cxl_port *port)
/* Don't leave table data allocated on error */ /* Don't leave table data allocated on error */
devm_kfree(dev, cdat_table); devm_kfree(dev, cdat_table);
dev_err(dev, "CDAT data read error\n"); dev_err(dev, "CDAT data read error\n");
return;
} }
port->cdat.table = cdat_table + sizeof(__le32); port->cdat.table = cdat_table + sizeof(__le32);

2
tools/testing/cxl/test/mock.c
View File

@ -19,7 +19,7 @@ void register_cxl_mock_ops(struct cxl_mock_ops *ops)
} }
EXPORT_SYMBOL_GPL(register_cxl_mock_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) void unregister_cxl_mock_ops(struct cxl_mock_ops *ops)
{ {