Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 14 Aug 2020 12:39:19 +0200
From:   Andrea Parri <parri.andrea@gmail.com>
To:     Haiyang Zhang <haiyangz@microsoft.com>
Cc:     Andres Beltran <lkmlabelt@gmail.com>,
        KY Srinivasan <kys@microsoft.com>,
        Stephen Hemminger <sthemmin@microsoft.com>,
        "wei.liu@kernel.org" <wei.liu@kernel.org>,
        "linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Michael Kelley <mikelley@microsoft.com>,
        Saruhan Karademir <skarade@microsoft.com>,
        "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: [PATCH] hv_netvsc: Add validation for untrusted Hyper-V values
Message-ID: <20200814103919.GA12689@andrea>
References: <20200728225321.26570-1-lkmlabelt@gmail.com>
 <BL0PR2101MB0930BC0130F6AE5775E62604CA4C0@BL0PR2101MB0930.namprd21.prod.outlook.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <BL0PR2101MB0930BC0130F6AE5775E62604CA4C0@BL0PR2101MB0930.namprd21.prod.outlook.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Haiyang,

[I'm resuming this work by Andres.  Sorry for the delay.]


> >  	switch (nvsp_packet->hdr.msg_type) {
> >  	case NVSP_MSG_TYPE_INIT_COMPLETE:
> >  	case NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE:
> >  	case NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE:
> >  	case NVSP_MSG5_TYPE_SUBCHANNEL:
> > +		if (msglen < sizeof(struct nvsp_message)) {
> > +			netdev_err(ndev, "nvsp_msg5 length too small: %u\n",
> > +				   msglen);
> > +			return;
> > +		}
> 
> struct nvsp_message includes all message types, so its length is the longest type,
> The messages from older host version are not necessarily reaching the 
> sizeof(struct nvsp_message).

I split the check above into several checks, one for each "case", using
(what I understand are) the corresponding structures/sizeofs...

> 
> Testing on both new and older hosts are recommended, in case I didn't find out all issues
> like this one.

Sure, will do.

Thanks,
  Andrea