nvme/nvme-cli
1
0
Fork 0
Code Issues Activity

Merging upstream version 2.10.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:27:38 +01:00
parent 736f2f7c80
commit 37275c4af3
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
530 changed files with 12276 additions and 4877 deletions
Download patch file Download diff file Expand all files Collapse all files

28
nvme-rpmb.c
View file

@ -207,7 +207,7 @@ static void write_file(unsigned char *data, size_t len, const char *dir,
const char *file, const char *msg)
{
char temp_folder[PATH_MAX] = { 0 };
FILE *fp = NULL;
_cleanup_file_ FILE *fp = NULL;
if (dir != NULL)
sprintf(temp_folder, "%s/%s", dir, file);
@ -219,7 +219,6 @@ static void write_file(unsigned char *data, size_t len, const char *dir,
fprintf(stderr, "Failed to write %s data to %s\n",
msg ? msg : "", temp_folder);
}
fclose(fp);
} else {
fprintf(stderr, "Failed to open %s file to write %s\n",
temp_folder, msg ? msg : "");
@ -602,9 +601,28 @@ static int rpmb_program_auth_key(int fd, unsigned char target,
goto out;
}
/* send request and read the result first */
rsp = rpmb_read_request(fd, req, req_size, rsp_size);
if (rsp == NULL || rsp->result != 0) {
/* send the request and get response */
err = send_rpmb_req(fd, req->target, req_size, req);
if (err) {
fprintf(stderr, "RPMB request 0x%04x for 0x%x, err: %d\n", req->type, req->target,
err);
goto out;
}
/* send the request to get the result and then request to get the response */
rsp = (struct rpmb_data_frame_t *)calloc(rsp_size, 1);
if (!rsp) {
fprintf(stderr, "failed to allocate response buffer memory\n");
err = -ENOMEM;
goto out;
}
rsp->target = req->target;
rsp->type = RPMB_REQ_READ_RESULT;
err = send_rpmb_req(fd, req->target, rsp_size, rsp);
if (err || rsp->result) {
fprintf(stderr, "Program auth key read result 0x%x, error = 0x%x\n", rsp->result,
err);
goto out;
}