Commit 12bc8dfb authored by Andrea Parri (Microsoft)'s avatar Andrea Parri (Microsoft) Committed by Jakub Kicinski
Browse files

hv_netvsc: Reset the RSC count if NVSP_STAT_FAIL in netvsc_receive() 



Commit 44144185 ("hv_netvsc: Add validation for untrusted Hyper-V
values") added validation to rndis_filter_receive_data() (and
rndis_filter_receive()) which introduced NVSP_STAT_FAIL-scenarios where
the count is not updated/reset.  Fix this omission, and prevent similar
scenarios from occurring in the future.

Reported-by: default avatarJuan Vazquez <juvazq@microsoft.com>
Signed-off-by: default avatarAndrea Parri (Microsoft) <parri.andrea@gmail.com>
Fixes: 44144185 ("hv_netvsc: Add validation for untrusted Hyper-V values")
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Link: https://lore.kernel.org/r/20210203113602.558916-1-parri.andrea@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 52cbd23a

drivers/net/hyperv/netvsc.c

+4 −1
Original line number Diff line number Diff line
@@ -1262,9 +1262,12 @@ static int netvsc_receive(struct net_device *ndev, 
		ret = rndis_filter_receive(ndev, net_device,

					   nvchan, data, buflen);



		if (unlikely(ret != NVSP_STAT_SUCCESS))

		if (unlikely(ret != NVSP_STAT_SUCCESS)) {

			/* Drop incomplete packet */

			nvchan->rsc.cnt = 0;

			status = NVSP_STAT_FAIL;

		}

	}



	enq_receive_complete(ndev, net_device, q_idx,

			     vmxferpage_packet->d.trans_id, status);

drivers/net/hyperv/rndis_filter.c

+0 −2
Original line number Diff line number Diff line
@@ -509,8 +509,6 @@ static int rndis_filter_receive_data(struct net_device *ndev, 
	return ret;



drop:

	/* Drop incomplete packet */

	nvchan->rsc.cnt = 0;

	return NVSP_STAT_FAIL;

}