Merge tag 'dmaengine-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-block.git] / drivers / dma / idxd / sysfs.c

diff --git a/drivers/dma/idxd/sysfs.c b/drivers/dma/idxd/sysfs.c
index dfd549685c467ac796c76873b4dca559f33e622c..3f262a57441b47bda8a124462f48254b633d25d9 100644 (file)
--- a/drivers/dma/idxd/sysfs.c
+++ b/drivers/dma/idxd/sysfs.c
@@ -588,7 +588,7 @@ static ssize_t wq_mode_store(struct device *dev,
        if (sysfs_streq(buf, "dedicated")) {
                set_bit(WQ_FLAG_DEDICATED, &wq->flags);
                wq->threshold = 0;
-       } else if (sysfs_streq(buf, "shared") && device_swq_supported(idxd)) {
+       } else if (sysfs_streq(buf, "shared")) {
                clear_bit(WQ_FLAG_DEDICATED, &wq->flags);
        } else {
                return -EINVAL;
@@ -832,6 +832,7 @@ static ssize_t wq_name_store(struct device *dev,
                             size_t count)
 {
        struct idxd_wq *wq = confdev_to_wq(dev);
+       char *input, *pos;
 
        if (wq->state != IDXD_WQ_DISABLED)
                return -EPERM;
@@ -846,9 +847,14 @@ static ssize_t wq_name_store(struct device *dev,
        if (wq->type == IDXD_WQT_KERNEL && device_pasid_enabled(wq->idxd))
                return -EOPNOTSUPP;
 
+       input = kstrndup(buf, count, GFP_KERNEL);
+       if (!input)
+               return -ENOMEM;
+
+       pos = strim(input);
        memset(wq->name, 0, WQ_NAME_SIZE + 1);
-       strncpy(wq->name, buf, WQ_NAME_SIZE);
-       strreplace(wq->name, '\n', '\0');
+       sprintf(wq->name, "%s", pos);
+       kfree(input);
        return count;
 }