svn commit: r342336 - stable/12/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Fri Dec 21 16:25:25 2018
New Revision: 342336
URL: https://svnweb.freebsd.org/changeset/base/342336

Log:
  MFC r341290
  
  sfxge(4): check size of memory to read sensors data to
  
  Size of provided memory should be consistent with specified size.
  
  Submitted by:   Martin Harvey <mharvey at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18252

Modified:
  stable/12/sys/dev/sfxge/common/mcdi_mon.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/sfxge/common/mcdi_mon.c
==============================================================================
--- stable/12/sys/dev/sfxge/common/mcdi_mon.c	Fri Dec 21 16:24:37 2018	(r342335)
+++ stable/12/sys/dev/sfxge/common/mcdi_mon.c	Fri Dec 21 16:25:25 2018	(r342336)
@@ -322,7 +322,13 @@ efx_mcdi_read_sensors(
 	uint8_t payload[MAX(MC_CMD_READ_SENSORS_EXT_IN_LEN,
 			    MC_CMD_READ_SENSORS_EXT_OUT_LEN)];
 	uint32_t addr_lo, addr_hi;
+	efx_rc_t rc;
 
+	if (EFSYS_MEM_SIZE(esmp) < size) {
+		rc = EINVAL;
+		goto fail1;
+	}
+
 	req.emr_cmd = MC_CMD_READ_SENSORS;
 	req.emr_in_buf = payload;
 	req.emr_in_length = MC_CMD_READ_SENSORS_EXT_IN_LEN;
@@ -339,6 +345,11 @@ efx_mcdi_read_sensors(
 	efx_mcdi_execute(enp, &req);
 
 	return (req.emr_rc);
+
+fail1:
+	EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+	return (rc);
 }
 
 static	__checkReturn	efx_rc_t