From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7swu-0003Pp-1A for qemu-devel@nongnu.org; Fri, 09 Aug 2013 16:06:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7swh-0002bL-Q5 for qemu-devel@nongnu.org; Fri, 09 Aug 2013 16:06:11 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:51143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7swh-0002ao-LS for qemu-devel@nongnu.org; Fri, 09 Aug 2013 16:05:59 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Aug 2013 21:05:59 +0100 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 0B887C9004A for ; Fri, 9 Aug 2013 16:05:54 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r79K5tZ9162188 for ; Fri, 9 Aug 2013 16:05:55 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r79K5tbM009047 for ; Fri, 9 Aug 2013 16:05:55 -0400 From: mrhines@linux.vnet.ibm.com Date: Fri, 9 Aug 2013 16:05:41 -0400 Message-Id: <1376078746-24948-3-git-send-email-mrhines@linux.vnet.ibm.com> In-Reply-To: <1376078746-24948-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1376078746-24948-1-git-send-email-mrhines@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 for-1.6 2/6] rdma: validate RDMAControlHeader::len List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: yamahata@private.email.ne.jp, aliguori@us.ibm.com, quintela@redhat.com, frank.yangjie@gmail.com, owasserm@redhat.com, mrhines@us.ibm.com, pbonzini@redhat.com From: Isaku Yamahata RMDAControlHeader::len is provided from remote, so validate it. Reviewed-by: Orit Wasserman Reviewed-by: Michael R. Hines Signed-off-by: Isaku Yamahata Signed-off-by: Michael R. Hines --- migration-rdma.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/migration-rdma.c b/migration-rdma.c index 6721266..ebe1f55 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -1424,6 +1424,7 @@ static int qemu_rdma_post_send_control(RDMAContext *rdma, uint8_t *buf, * The copy makes the RDMAControlHeader simpler to manipulate * for the time being. */ + assert(head->len <= RDMA_CONTROL_MAX_BUFFER - sizeof(*head)); memcpy(wr->control, head, sizeof(RDMAControlHeader)); control_to_network((void *) wr->control); @@ -1504,6 +1505,10 @@ static int qemu_rdma_exchange_get_response(RDMAContext *rdma, control_desc[head->type], head->type, head->len); return -EIO; } + if (head->len > RDMA_CONTROL_MAX_BUFFER - sizeof(*head)) { + fprintf(stderr, "too long length: %d\n", head->len); + return -EINVAL; + } return 0; } -- 1.7.10.4