| Message ID | 7d850f417b20bfa559e6ef3eb133d336fb2eda3f.camel@intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d7d1f235aaffbac15a07455a774aca42d027638c |
| Headers | show |
| Series | [GIT,PULL] libnvdimm fixes for v5.9-rc3 | expand |
The pull request you sent on Tue, 25 Aug 2020 00:57:12 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git tags/libnvdimm-fix-v5.9-rc3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d7d1f235aaffbac15a07455a774aca42d027638c
Thank you!
diff --git a/drivers/dax/super.c b/drivers/dax/super.c index c82cbcb64202..32642634c1bb 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -100,6 +100,12 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev, return false; } + if (!dax_dev && !bdev_dax_supported(bdev, blocksize)) { + pr_debug("%s: error: dax unsupported by block device\n", + bdevname(bdev, buf)); + return false; + } + id = dax_read_lock(); len = dax_direct_access(dax_dev, pgoff, 1, &kaddr, &pfn); len2 = dax_direct_access(dax_dev, pgoff_end, 1, &end_kaddr, &end_pfn); diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index 61374def5155..b59032e0859b 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -529,6 +529,7 @@ static DEVICE_ATTR_ADMIN_RW(activate); static struct attribute *nvdimm_firmware_attributes[] = { &dev_attr_activate.attr, &dev_attr_result.attr, + NULL, }; static umode_t nvdimm_firmware_visible(struct kobject *kobj, struct attribute *a, int n)
Hi Linus, please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git tags/libnvdimm-fix-v5.9-rc3 ...to receive a couple of minor fixes for things merged in 5.9-rc1. One is an out-of-bounds access caught by KASAN, and the second is a tweak to some overzealous logging about dax support even for traditional block devices which was unnecessary. These have appeared in -next without any problems. --- The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5: Linux 5.9-rc1 (2020-08-16 13:04:57 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git tags/libnvdimm-fix-v5.9-rc3 for you to fetch changes up to c2affe920b0e0669650943ac086215cf6519be34: dax: do not print error message for non-persistent memory block device (2020-08-20 11:43:18 -0600) ---------------------------------------------------------------- libnvdimm fixes for v5.9-rc3 Fix an out-of-bounds access introduced in libnvdimm v5.9-rc1 dax: do not print error message for non-persistent memory block device ---------------------------------------------------------------- Adrian Huang (1): dax: do not print error message for non-persistent memory block device Zqiang (1): libnvdimm: KASAN: global-out-of-bounds Read in internal_create_group drivers/dax/super.c | 6 ++++++ drivers/nvdimm/dimm_devs.c | 1 + 2 files changed, 7 insertions(+)