nd_pmem_probe() ignores errors from nd_btt_probe() and only propagates
-EOPNOTSUPP from nd_pfn_probe() and nd_dax_probe(). An allocation
failure such as -ENOMEM can therefore be overwritten by subsequent
personality probes, allowing the namespace to be attached as raw PMEM.

Return discovery errors other than -ENODEV and -ENXIO. Preserve the
existing raw-PMEM fallback for those error codes.

Fixes: 8c2f7e8658df ("libnvdimm: infrastructure for btt devices")
Signed-off-by: Avi Weiss <[email protected]>
---
 drivers/nvdimm/pmem.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 0766a6949b28..78acc9b0b1a0 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -632,6 +632,8 @@ static int nd_pmem_probe(struct device *dev)
        ret = nd_btt_probe(dev, ndns);
        if (ret == 0)
                return -ENXIO;
+       else if (ret != -ENODEV && ret != -ENXIO)
+               return ret;
 
        /*
         * We have two failure conditions here, there is no
@@ -647,13 +649,13 @@ static int nd_pmem_probe(struct device *dev)
        ret = nd_pfn_probe(dev, ndns);
        if (ret == 0)
                return -ENXIO;
-       else if (ret == -EOPNOTSUPP)
+       else if (ret != -ENODEV && ret != -ENXIO)
                return ret;
 
        ret = nd_dax_probe(dev, ndns);
        if (ret == 0)
                return -ENXIO;
-       else if (ret == -EOPNOTSUPP)
+       else if (ret != -ENODEV && ret != -ENXIO)
                return ret;
 
        /* probe complete, attach handles namespace enabling */

base-commit: d89e1d186ec9271bf78e62771779e9fc03bf0fc3
-- 
2.43.0


Reply via email to