d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sbuf_finish() error code check in user-space.

Browse Source 
MFC after:	1 week
Sponsored by:	iXsystems, Inc.
This commit is contained in:
Alexander Motin 2020-10-13 23:29:06 +00:00
parent 388197f414
commit cd500da924
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/cam/ata/ata_all.c
View File

@ -318,7 +318,12 @@ ata_cmd_string(struct ata_cmd *cmd, char *cmd_string, size_t len)
ata_cmd_sbuf(cmd, &sb);
error = sbuf_finish(&sb);
if (error != 0 && error != ENOMEM)
if (error != 0 &&
#ifdef _KERNEL
error != ENOMEM)
#else
errno != ENOMEM)
#endif
return ("");
return(sbuf_data(&sb));
@ -348,7 +353,12 @@ ata_res_string(struct ata_res *res, char *res_string, size_t len)
ata_res_sbuf(res, &sb);
error = sbuf_finish(&sb);
if (error != 0 && error != ENOMEM)
if (error != 0 &&
#ifdef _KERNEL
error != ENOMEM)
#else
errno != ENOMEM)
#endif
return ("");
return(sbuf_data(&sb));

7
sys/cam/nvme/nvme_all.c
View File

@ -152,7 +152,12 @@ nvme_cmd_string(const struct nvme_command *cmd, char *cmd_string, size_t len)
nvme_cmd_sbuf(cmd, &sb);
error = sbuf_finish(&sb);
if (error != 0 && error != ENOMEM)
if (error != 0 &&
#ifdef _KERNEL
error != ENOMEM)
#else
errno != ENOMEM)
#endif
return ("");
return(sbuf_data(&sb));

7
sys/cam/scsi/scsi_all.c
View File

@ -3486,7 +3486,12 @@ scsi_cdb_string(u_int8_t *cdb_ptr, char *cdb_string, size_t len)
/* ENOMEM just means that the fixed buffer is full, OK to ignore */
error = sbuf_finish(&sb);
if (error != 0 && error != ENOMEM)
if (error != 0 &&
#ifdef _KERNEL
error != ENOMEM)
#else
errno != ENOMEM)
#endif
return ("");
return(sbuf_data(&sb));