Skip to content

Commit 2c65183

Browse files
Robert Richterjfvogel
authored andcommitted
libnvdimm/labels: Fix divide error in nd_label_data_init()
[ Upstream commit ef1d3455bbc1922f94a91ed58d3d7db440652959 ] If a faulty CXL memory device returns a broken zero LSA size in its memory device information (Identify Memory Device (Opcode 4000h), CXL spec. 3.1, 8.2.9.9.1.1), a divide error occurs in the libnvdimm driver: Oops: divide error: 0000 [#1] PREEMPT SMP NOPTI RIP: 0010:nd_label_data_init+0x10e/0x800 [libnvdimm] Code and flow: 1) CXL Command 4000h returns LSA size = 0 2) config_size is assigned to zero LSA size (CXL pmem driver): drivers/cxl/pmem.c: .config_size = mds->lsa_size, 3) max_xfer is set to zero (nvdimm driver): drivers/nvdimm/label.c: max_xfer = min_t(size_t, ndd->nsarea.max_xfer, config_size); 4) A subsequent DIV_ROUND_UP() causes a division by zero: drivers/nvdimm/label.c: /* Make our initial read size a multiple of max_xfer size */ drivers/nvdimm/label.c: read_size = min(DIV_ROUND_UP(read_size, max_xfer) * max_xfer, drivers/nvdimm/label.c- config_size); Fix this by checking the config size parameter by extending an existing check. Signed-off-by: Robert Richter <[email protected]> Reviewed-by: Pankaj Gupta <[email protected]> Reviewed-by: Ira Weiny <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Ira Weiny <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 1d1e1efad1cf049e888bf175a5c6be85d792620c) Signed-off-by: Jack Vogel <[email protected]>
1 parent 1afc98a commit 2c65183

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/nvdimm/label.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,8 @@ int nd_label_data_init(struct nvdimm_drvdata *ndd)
442442
if (ndd->data)
443443
return 0;
444444

445-
if (ndd->nsarea.status || ndd->nsarea.max_xfer == 0) {
445+
if (ndd->nsarea.status || ndd->nsarea.max_xfer == 0 ||
446+
ndd->nsarea.config_size == 0) {
446447
dev_dbg(ndd->dev, "failed to init config data area: (%u:%u)\n",
447448
ndd->nsarea.max_xfer, ndd->nsarea.config_size);
448449
return -ENXIO;

0 commit comments

Comments
 (0)