Skip to content

Commit df24560

Browse files
committed
Merge tag 'nvme-6.1-2022-11-10' of git://git.infradead.org/nvme into block-6.1
Pull NVMe fixes from Christoph: "nvme fixes for Linux 6.1 - quiet user passthrough command errors (Keith Busch) - fix memory leak in nvmet_subsys_attr_model_store_locked - fix a memory leak in nvmet-auth (Sagi Grimberg)" * tag 'nvme-6.1-2022-11-10' of git://git.infradead.org/nvme: nvmet: fix a memory leak nvmet: fix memory leak in nvmet_subsys_attr_model_store_locked nvme: quiet user passthrough command errors
2 parents f829230 + e65fdf5 commit df24560

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

drivers/nvme/host/core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ void nvme_init_request(struct request *req, struct nvme_command *cmd)
675675
if (req->mq_hctx->type == HCTX_TYPE_POLL)
676676
req->cmd_flags |= REQ_POLLED;
677677
nvme_clear_nvme_request(req);
678+
req->rq_flags |= RQF_QUIET;
678679
memcpy(nvme_req(req)->cmd, cmd, sizeof(*cmd));
679680
}
680681
EXPORT_SYMBOL_GPL(nvme_init_request);
@@ -1037,7 +1038,6 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
10371038
goto out;
10381039
}
10391040

1040-
req->rq_flags |= RQF_QUIET;
10411041
ret = nvme_execute_rq(req, at_head);
10421042
if (result && ret >= 0)
10431043
*result = nvme_req(req)->result;
@@ -1227,7 +1227,6 @@ static void nvme_keep_alive_work(struct work_struct *work)
12271227
rq->timeout = ctrl->kato * HZ;
12281228
rq->end_io = nvme_keep_alive_end_io;
12291229
rq->end_io_data = ctrl;
1230-
rq->rq_flags |= RQF_QUIET;
12311230
blk_execute_rq_nowait(rq, false);
12321231
}
12331232

drivers/nvme/host/pci.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,6 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req)
14361436

14371437
abort_req->end_io = abort_endio;
14381438
abort_req->end_io_data = NULL;
1439-
abort_req->rq_flags |= RQF_QUIET;
14401439
blk_execute_rq_nowait(abort_req, false);
14411440

14421441
/*
@@ -2490,7 +2489,6 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode)
24902489
req->end_io_data = nvmeq;
24912490

24922491
init_completion(&nvmeq->delete_done);
2493-
req->rq_flags |= RQF_QUIET;
24942492
blk_execute_rq_nowait(req, false);
24952493
return 0;
24962494
}

drivers/nvme/target/configfs.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,6 +1215,7 @@ static ssize_t nvmet_subsys_attr_model_store_locked(struct nvmet_subsys *subsys,
12151215
const char *page, size_t count)
12161216
{
12171217
int pos = 0, len;
1218+
char *val;
12181219

12191220
if (subsys->subsys_discovered) {
12201221
pr_err("Can't set model number. %s is already assigned\n",
@@ -1237,9 +1238,11 @@ static ssize_t nvmet_subsys_attr_model_store_locked(struct nvmet_subsys *subsys,
12371238
return -EINVAL;
12381239
}
12391240

1240-
subsys->model_number = kmemdup_nul(page, len, GFP_KERNEL);
1241-
if (!subsys->model_number)
1241+
val = kmemdup_nul(page, len, GFP_KERNEL);
1242+
if (!val)
12421243
return -ENOMEM;
1244+
kfree(subsys->model_number);
1245+
subsys->model_number = val;
12431246
return count;
12441247
}
12451248

@@ -1836,6 +1839,7 @@ static void nvmet_host_release(struct config_item *item)
18361839

18371840
#ifdef CONFIG_NVME_TARGET_AUTH
18381841
kfree(host->dhchap_secret);
1842+
kfree(host->dhchap_ctrl_secret);
18391843
#endif
18401844
kfree(host);
18411845
}

0 commit comments

Comments
 (0)