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

[Andrew Rybchenko]

Author: arybchik
Date: Fri Dec 21 15:05:01 2018
New Revision: 342310
URL: https://svnweb.freebsd.org/changeset/base/342310

Log:
  r340798
  
  sfxge(4): fix out of bounds read in VIs allocation
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18068

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

Modified: stable/12/sys/dev/sfxge/common/ef10_nic.c
==============================================================================
--- stable/12/sys/dev/sfxge/common/ef10_nic.c	Fri Dec 21 15:03:44 2018	(r342309)
+++ stable/12/sys/dev/sfxge/common/ef10_nic.c	Fri Dec 21 15:05:01 2018	(r342310)
@@ -557,7 +557,7 @@ efx_mcdi_alloc_vis(
 {
 	efx_mcdi_req_t req;
 	uint8_t payload[MAX(MC_CMD_ALLOC_VIS_IN_LEN,
-			    MC_CMD_ALLOC_VIS_OUT_LEN)];
+			    MC_CMD_ALLOC_VIS_EXT_OUT_LEN)];
 	efx_rc_t rc;
 
 	if (vi_countp == NULL) {
@@ -570,7 +570,7 @@ efx_mcdi_alloc_vis(
 	req.emr_in_buf = payload;
 	req.emr_in_length = MC_CMD_ALLOC_VIS_IN_LEN;
 	req.emr_out_buf = payload;
-	req.emr_out_length = MC_CMD_ALLOC_VIS_OUT_LEN;
+	req.emr_out_length = MC_CMD_ALLOC_VIS_EXT_OUT_LEN;
 
 	MCDI_IN_SET_DWORD(req, ALLOC_VIS_IN_MIN_VI_COUNT, min_vi_count);
 	MCDI_IN_SET_DWORD(req, ALLOC_VIS_IN_MAX_VI_COUNT, max_vi_count);