Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1632856ybv; Fri, 21 Feb 2020 00:40:08 -0800 (PST) X-Google-Smtp-Source: APXvYqyKgzxL/lqgGP3jppGzVao32qnciuH0ZCUI9zLdnShbJxhAP8/dHfAbNgDUuFxXrIxoqTn8 X-Received: by 2002:a05:6830:1d7b:: with SMTP id l27mr25555343oti.251.1582274407892; Fri, 21 Feb 2020 00:40:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582274407; cv=none; d=google.com; s=arc-20160816; b=mKoJSZFdMWJH7YCkjECmzjEMtur4MCj6ZTZqOA8ei0FhhXKWwkh1axXZ0aD78bBfpI M6daFASB9lvUOJRpXC7I3dfnhbEGB/5qR7EIo18+MhzbFMOda1g68/qXMSQ8q2LgeMgz MK7Xhu13H2FlUAkPOeimaCwueucRPr8IfkbZGpQsydJk/jQ9WBVpk7erQ4blDMPmcaag SsedUA3IYfNKUg90Tnnk3AxZULNDs66b/cuhUq8B3CNN8D//6DRZwtQ/rbbOKsIbt05C qo8wF2pzX3tIgSmaYHiK2WdqLXzczAQyfB8KizBggkn9rvr8sgGUxEHDm8u4yTEmJ4OS 0aCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KLy2ZpacvD2k6B5XvXs5EtBAjnQCDCzpLfNMXvy+GEE=; b=qmQC7h6YMeIAqU4bHukLFfCeJ3gHGZLCg+mkunGbNq2PcdEBODlRDhTOBDbwJilQvu iRp2MoT6fKbyHx3SxtL0WwJyck02k3ATyDH9nOuKET2laOneYT0SLAAMR1WDP0k86o+b PYYj/xT7oPn3iu0IIn2VadmRVieCltGr94p6VWdgAoSr9nvggOamjZ/ehWoYWTy7Ky/3 GjmLutogrddRv8/74l1GE62DpB0WOWfEHoI0cHJ+EYEvhC3/oApWrsA2JyDLTUxyxsFO nV5dOnopo5t07psDFiyxyBK1sBjLk1QjrnqiUpaYtBi26hnpBGCcULdLo64kGjmLeSS/ P8sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ImkZpzxJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u14si1186944otk.178.2020.02.21.00.39.55; Fri, 21 Feb 2020 00:40:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ImkZpzxJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731190AbgBUIBV (ORCPT + 99 others); Fri, 21 Feb 2020 03:01:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:33570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731024AbgBUIBR (ORCPT ); Fri, 21 Feb 2020 03:01:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C8E592073A; Fri, 21 Feb 2020 08:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272077; bh=0yf6ce4sDrBOesE1j8wafwtcfGWYWuH7tZjl7vWwWFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ImkZpzxJspaB5ieOOs0GoFlH9baWE2BjBVc/cvhcxP5QEvtkOyxqtvY7thKRNxd3w 9PPXtll6dhYxqtmy16hefQulu4+QOtC37eSzVb4snsgWSgm3FMH7h15J2dN5GsukMU PJ0rDIVCuDWQloEhqH4/uknp9cYJshuuORO7uIRc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Michael S. Tsirkin" , David Hildenbrand , Sasha Levin Subject: [PATCH 5.5 393/399] virtio_balloon: prevent pfn array overflow Date: Fri, 21 Feb 2020 08:41:58 +0100 Message-Id: <20200221072438.118804855@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael S. Tsirkin [ Upstream commit 6e9826e77249355c09db6ba41cd3f84e89f4b614 ] Make sure, at build time, that pfn array is big enough to hold a single page. It happens to be true since the PAGE_SHIFT value at the moment is 20, which is 1M - exactly 256 4K balloon pages. Signed-off-by: Michael S. Tsirkin Reviewed-by: David Hildenbrand Signed-off-by: Sasha Levin --- drivers/virtio/virtio_balloon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 7e5d84caeb940..7bfe365d93720 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -158,6 +158,8 @@ static void set_page_pfns(struct virtio_balloon *vb, { unsigned int i; + BUILD_BUG_ON(VIRTIO_BALLOON_PAGES_PER_PAGE > VIRTIO_BALLOON_ARRAY_PFNS_MAX); + /* * Set balloon pfns pointing at this page. * Note that the first pfn points at start of the page. -- 2.20.1