libnvdimm, bus: check if type of nd_device_driver within valid scope
PATCH v2 1/1 libnvdimm, bus: check if type of nd_device_driver within valid scope
From: Ocean He <[email protected]>
According to enum nd_driver_flags, the valid type of nd_device_driver start from 0x02 and end up with 0x80. Both 0x00 and 0x01 are invalid, and the value larger than 0x80 is invalid.
To filter valid type, ND_DRIVER_FLAGS_MASK is defined as (((ND_DRIVER_FLAGS_MAX) << 1) - 2). For example, when ND_DRIVER_FLAGS_MAX equals to ND_DRIVER_DAX_PMEM(0x80), then ND_DRIVER_FLAGS_MASK equals to 0xFE.
Signed-off-by Ocean He <[email protected]>
---
v1: https://www.spinics.net/lists/kernel/msg2869760.html
v2: Sorry for noise. I got an email problem, so I have to resend to loop [email protected].
drivers/nvdimm/bus.c | 2 +- include/uapi/linux/ndctl.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/nvdimm/bus.c +1 -1
@@ -546,7 +546,7 @@ int __nd_driver_register(struct nd_device_driver *nd_drv, struct module *owner, {struct device_driver *drv = &nd_drv->drv; -if (!nd_drv->type) { +if (!(nd_drv->type &ND_DRIVER_FLAGS_MASK )) {pr_debug ("driver type bitmask not set (%pf)\n" ,__builtin_return_address (0 ));return -EINVAL ;
include/uapi/linux/ndctl.h +2 -0
@@ -207,6 +207,8 @@ enum nd_driver_flags {ND_DRIVER_NAMESPACE_BLK =1 <<ND_DEVICE_NAMESPACE_BLK , ND_DRIVER_DAX_PMEM = 1 << ND_DEVICE_DAX_PMEM, }; +#define ND_DRIVER_FLAGS_MAX ND_DRIVER_DAX_PMEM +#define ND_DRIVER_FLAGS_MASK (((ND_DRIVER_FLAGS_MAX) << 1) - 2)enum { ND_MIN_NAMESPACE_SIZE = PAGE_SIZE,
Signature · 6 lines
1.8.3.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm