From nobody Thu Apr 25 03:42:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1589963720; cv=none; d=zohomail.com; s=zohoarc; b=IRPixTJqeXVYx/lPI/CL9hkIVdF3rSMHolchObl4AxXEMXeHm5Ad0/SinpKpPuWDRwVCMMs6CeOARqjO2YwfFQe03pxkIpqjCrXseT1K52A+fUd1pFkx5X+jeIcjl7l/Qoqz2OwxbQ7hAqPPlW/uWCgqifl7uTIKJViBe2axlg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589963720; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=9z1C3ZpbYJwS8bHJryUYAm+2s9MMbYe3FESRR5NJJ/U=; b=B5meZEK0BEfa+Ozb40I5AAMYnIv7S9OTtrsDu8Aiu5thg9JMO+kkP/IHQj7AweJwDxkPuqzpvtET0D9k7/Su4r8YW5BHZtdxLSSuKSDgIwffftcVpWGCW1VSNG2E8RWmDiEBQl+woiTeLnRmGFJzi+3h0uk0X8T9PFUgXXvpyp0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1589963720784766.9020663910436; Wed, 20 May 2020 01:35:20 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbKBv-00004z-Ga; Wed, 20 May 2020 08:35:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbKBu-00004t-Jl for xen-devel@lists.xenproject.org; Wed, 20 May 2020 08:35:06 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cd437894-9a74-11ea-a9d1-12813bfff9fa; Wed, 20 May 2020 08:35:04 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F281BACA7; Wed, 20 May 2020 08:35:05 +0000 (UTC) X-Inumbo-ID: cd437894-9a74-11ea-a9d1-12813bfff9fa X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Subject: [PATCH] tools/libxengnttab: correct size of allocated memory Date: Wed, 20 May 2020 10:35:01 +0200 Message-Id: <20200520083501.31704-1-jgross@suse.com> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" The size of the memory allocated for the IOCTL_GNTDEV_MAP_GRANT_REF ioctl() parameters is calculated wrong, which results in too much memory allocated. Signed-off-by: Juergen Gross Reviewed-by: Ian Jackson Reviewed-by: Roger Pau Monn=C3=A9 --- tools/libs/gnttab/freebsd.c | 2 +- tools/libs/gnttab/linux.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/libs/gnttab/freebsd.c b/tools/libs/gnttab/freebsd.c index 886b588303..0588501d0f 100644 --- a/tools/libs/gnttab/freebsd.c +++ b/tools/libs/gnttab/freebsd.c @@ -74,7 +74,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, void *addr =3D NULL; int domids_stride; unsigned int refs_size =3D ROUNDUP(count * - sizeof(struct ioctl_gntdev_map_grant_= ref), + sizeof(struct ioctl_gntdev_grant_ref), PAGE_SHIFT); =20 domids_stride =3D (flags & XENGNTTAB_GRANT_MAP_SINGLE_DOMAIN) ? 0 : 1; diff --git a/tools/libs/gnttab/linux.c b/tools/libs/gnttab/linux.c index a01bb6c698..74331a4c7b 100644 --- a/tools/libs/gnttab/linux.c +++ b/tools/libs/gnttab/linux.c @@ -91,9 +91,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, { int fd =3D xgt->fd; struct ioctl_gntdev_map_grant_ref *map; - unsigned int map_size =3D ROUNDUP((sizeof(*map) + (count - 1) * - sizeof(struct ioctl_gntdev_map_grant_r= ef)), - PAGE_SHIFT); + unsigned int map_size =3D sizeof(*map) + (count - 1) * sizeof(map->ref= s[0]); void *addr =3D NULL; int domids_stride =3D 1; int i; @@ -102,10 +100,10 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, domids_stride =3D 0; =20 if ( map_size <=3D PAGE_SIZE ) - map =3D alloca(sizeof(*map) + - (count - 1) * sizeof(struct ioctl_gntdev_map_grant_re= f)); + map =3D alloca(map_size); else { + map_size =3D ROUNDUP(map_size, PAGE_SHIFT); map =3D mmap(NULL, map_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON | MAP_POPULATE, -1, 0); if ( map =3D=3D MAP_FAILED ) --=20 2.26.1