leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-5.6/libnvdimm-fixes' into libnvdimm-for-next

Browse Source 
Pick up some miscellaneous minor fixes, that missed v5.6-final,
including a some smatch reports in the ioctl path and some unit test
compilation fixups.
This commit is contained in:
Dan Williams 2020-04-02 19:47:12 -07:00
commit 91bf79bcb6
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -9569,6 +9569,7 @@ F: drivers/acpi/nfit/*
F: include/linux/nd.h F: include/linux/nd.h
F: include/linux/libnvdimm.h F: include/linux/libnvdimm.h
F: include/uapi/linux/ndctl.h F: include/uapi/linux/ndctl.h
F: tools/testing/nvdimm/
LICENSES and SPDX stuff LICENSES and SPDX stuff
M: Thomas Gleixner <tglx@linutronix.de> M: Thomas Gleixner <tglx@linutronix.de>

10
drivers/acpi/nfit/core.c
View File

@ -360,7 +360,7 @@ static union acpi_object *acpi_label_info(acpi_handle handle)
static u8 nfit_dsm_revid(unsigned family, unsigned func) static u8 nfit_dsm_revid(unsigned family, unsigned func)
{ {
static const u8 revid_table[NVDIMM_FAMILY_MAX+1][32] = { static const u8 revid_table[NVDIMM_FAMILY_MAX+1][NVDIMM_CMD_MAX+1] = {
[NVDIMM_FAMILY_INTEL] = { [NVDIMM_FAMILY_INTEL] = {
[NVDIMM_INTEL_GET_MODES] = 2, [NVDIMM_INTEL_GET_MODES] = 2,
[NVDIMM_INTEL_GET_FWINFO] = 2, [NVDIMM_INTEL_GET_FWINFO] = 2,
@ -386,7 +386,7 @@ static u8 nfit_dsm_revid(unsigned family, unsigned func)
if (family > NVDIMM_FAMILY_MAX) if (family > NVDIMM_FAMILY_MAX)
return 0; return 0;
if (func > 31) if (func > NVDIMM_CMD_MAX)
return 0; return 0;
id = revid_table[family][func]; id = revid_table[family][func];
if (id == 0) if (id == 0)
@ -492,7 +492,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
* Check for a valid command. For ND_CMD_CALL, we also have to * Check for a valid command. For ND_CMD_CALL, we also have to
* make sure that the DSM function is supported. * make sure that the DSM function is supported.
*/ */
if (cmd == ND_CMD_CALL && !test_bit(func, &dsm_mask)) if (cmd == ND_CMD_CALL &&
(func > NVDIMM_CMD_MAX || !test_bit(func, &dsm_mask)))
return -ENOTTY; return -ENOTTY;
else if (!test_bit(cmd, &cmd_mask)) else if (!test_bit(cmd, &cmd_mask))
return -ENOTTY; return -ENOTTY;
@ -3494,7 +3495,8 @@ static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
if (nvdimm && cmd == ND_CMD_CALL && if (nvdimm && cmd == ND_CMD_CALL &&
call_pkg->nd_family == NVDIMM_FAMILY_INTEL) { call_pkg->nd_family == NVDIMM_FAMILY_INTEL) {
func = call_pkg->nd_command; func = call_pkg->nd_command;
if ((1 << func) & NVDIMM_INTEL_SECURITY_CMDMASK) if (func > NVDIMM_CMD_MAX ||
(1 << func) & NVDIMM_INTEL_SECURITY_CMDMASK)
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }

1
drivers/acpi/nfit/nfit.h
View File

@ -34,6 +34,7 @@
| ACPI_NFIT_MEM_NOT_ARMED | ACPI_NFIT_MEM_MAP_FAILED) | ACPI_NFIT_MEM_NOT_ARMED | ACPI_NFIT_MEM_MAP_FAILED)
#define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_HYPERV #define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_HYPERV
#define NVDIMM_CMD_MAX 31
#define NVDIMM_STANDARD_CMDMASK \ #define NVDIMM_STANDARD_CMDMASK \
(1 << ND_CMD_SMART | 1 << ND_CMD_SMART_THRESHOLD | 1 << ND_CMD_DIMM_FLAGS \ (1 << ND_CMD_SMART | 1 << ND_CMD_SMART_THRESHOLD | 1 << ND_CMD_DIMM_FLAGS \

4
drivers/nvdimm/bus.c
View File

@ -1042,7 +1042,9 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm,
return -EFAULT; return -EFAULT;
} }
if (!desc || (desc->out_num + desc->in_num == 0) || if (!desc ||
(desc->out_num + desc->in_num == 0) ||
cmd > ND_CMD_CALL ||
!test_bit(cmd, &cmd_mask)) !test_bit(cmd, &cmd_mask))
return -ENOTTY; return -ENOTTY;

4
tools/testing/nvdimm/Kbuild
View File

@ -21,8 +21,8 @@ DRIVERS := ../../../drivers
NVDIMM_SRC := $(DRIVERS)/nvdimm NVDIMM_SRC := $(DRIVERS)/nvdimm
ACPI_SRC := $(DRIVERS)/acpi/nfit ACPI_SRC := $(DRIVERS)/acpi/nfit
DAX_SRC := $(DRIVERS)/dax DAX_SRC := $(DRIVERS)/dax
ccflags-y := -I$(src)/$(NVDIMM_SRC)/ ccflags-y := -I$(srctree)/drivers/nvdimm/
ccflags-y += -I$(src)/$(ACPI_SRC)/ ccflags-y += -I$(srctree)/drivers/acpi/nfit/
obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o

4
tools/testing/nvdimm/test/Kbuild
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
ccflags-y := -I$(src)/../../../../drivers/nvdimm/ ccflags-y := -I$(srctree)/drivers/nvdimm/
ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/ ccflags-y += -I$(srctree)/drivers/acpi/nfit/
obj-m += nfit_test.o obj-m += nfit_test.o
obj-m += nfit_test_iomap.o obj-m += nfit_test_iomap.o

2
tools/testing/nvdimm/test/nfit.c
View File

@ -3164,7 +3164,9 @@ static __init int nfit_test_init(void)
mcsafe_test(); mcsafe_test();
dax_pmem_test(); dax_pmem_test();
dax_pmem_core_test(); dax_pmem_core_test();
#ifdef CONFIG_DEV_DAX_PMEM_COMPAT
dax_pmem_compat_test(); dax_pmem_compat_test();
#endif
nfit_test_setup(nfit_test_lookup, nfit_test_evaluate_dsm); nfit_test_setup(nfit_test_lookup, nfit_test_evaluate_dsm);