svn commit: r366689 - in head/sys/cam: ata nvme scsi

[Alexander Motin]

Author: mav
Date: Tue Oct 13 23:29:06 2020
New Revision: 366689
URL: https://svnweb.freebsd.org/changeset/base/366689

Log:
  Fix sbuf_finish() error code check in user-space.
  
  MFC after:	1 week
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/cam/ata/ata_all.c
  head/sys/cam/nvme/nvme_all.c
  head/sys/cam/scsi/scsi_all.c

Modified: head/sys/cam/ata/ata_all.c
==============================================================================
--- head/sys/cam/ata/ata_all.c	Tue Oct 13 22:49:43 2020	(r366688)
+++ head/sys/cam/ata/ata_all.c	Tue Oct 13 23:29:06 2020	(r366689)
@@ -318,7 +318,12 @@ ata_cmd_string(struct ata_cmd *cmd, char *cmd_string, 
 	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, 
 	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));

Modified: head/sys/cam/nvme/nvme_all.c
==============================================================================
--- head/sys/cam/nvme/nvme_all.c	Tue Oct 13 22:49:43 2020	(r366688)
+++ head/sys/cam/nvme/nvme_all.c	Tue Oct 13 23:29:06 2020	(r366689)
@@ -152,7 +152,12 @@ nvme_cmd_string(const struct nvme_command *cmd, char *
 	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));

Modified: head/sys/cam/scsi/scsi_all.c
==============================================================================
--- head/sys/cam/scsi/scsi_all.c	Tue Oct 13 22:49:43 2020	(r366688)
+++ head/sys/cam/scsi/scsi_all.c	Tue Oct 13 23:29:06 2020	(r366689)
@@ -3486,7 +3486,12 @@ scsi_cdb_string(u_int8_t *cdb_ptr, char *cdb_string, s
 
 	/* 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));