svn commit: r366867 - in stable/12/sys/cam: ata nvme scsi

[Alexander Motin]

Author: mav
Date: Tue Oct 20 02:28:07 2020
New Revision: 366867
URL: https://svnweb.freebsd.org/changeset/base/366867

Log:
  MFC r366689: Fix sbuf_finish() error code check in user-space.

Modified:
  stable/12/sys/cam/ata/ata_all.c
  stable/12/sys/cam/nvme/nvme_all.c
  stable/12/sys/cam/scsi/scsi_all.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/cam/ata/ata_all.c
==============================================================================
--- stable/12/sys/cam/ata/ata_all.c	Tue Oct 20 01:29:45 2020	(r366866)
+++ stable/12/sys/cam/ata/ata_all.c	Tue Oct 20 02:28:07 2020	(r366867)
@@ -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: stable/12/sys/cam/nvme/nvme_all.c
==============================================================================
--- stable/12/sys/cam/nvme/nvme_all.c	Tue Oct 20 01:29:45 2020	(r366866)
+++ stable/12/sys/cam/nvme/nvme_all.c	Tue Oct 20 02:28:07 2020	(r366867)
@@ -153,7 +153,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: stable/12/sys/cam/scsi/scsi_all.c
==============================================================================
--- stable/12/sys/cam/scsi/scsi_all.c	Tue Oct 20 01:29:45 2020	(r366866)
+++ stable/12/sys/cam/scsi/scsi_all.c	Tue Oct 20 02:28:07 2020	(r366867)
@@ -3488,7 +3488,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));