Merge tag 'libnvdimm-fixes-6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

torvalds · torvalds · commit a9c2be4f3730 · 2023-10-02T13:52:47.000-07:00
Pull libnvdimm fix from Dave Jiang:

 - Fix incorrect calculation of idt size in NFIT

* tag 'libnvdimm-fixes-6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  ACPI: NFIT: Fix incorrect calculation of idt size
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
@@ -855,7 +855,7 @@ static size_t sizeof_idt(struct acpi_nfit_interleave *idt)
 {
 	if (idt->header.length < sizeof(*idt))
 		return 0;
-	return sizeof(*idt) + sizeof(u32) * (idt->line_count - 1);
+	return sizeof(*idt) + sizeof(u32) * idt->line_count;
 }
 
 static bool add_idt(struct acpi_nfit_desc *acpi_desc,

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ static size_t sizeof_idt(struct acpi_nfit_interleave *idt)`
`855`	`855`	`{`
`856`	`856`	`if (idt->header.length < sizeof(*idt))`
`857`	`857`	`return 0;`
`858`		`- return sizeof(idt) + sizeof(u32) (idt->line_count - 1);`
	`858`	`+ return sizeof(idt) + sizeof(u32) idt->line_count;`
`859`	`859`	`}`
`860`	`860`
`861`	`861`	`static bool add_idt(struct acpi_nfit_desc *acpi_desc,`