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;
Subject: [PATCH 2/3] xen/privcmd: fix error handling in mmap-resource
 processing
From:   Jan Beulich <jbeulich@suse.com>
To:     Juergen Gross <jgross@suse.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc:     Stefano Stabellini <sstabellini@kernel.org>,
        "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
        lkml <linux-kernel@vger.kernel.org>
References: <0f0db6fa-2604-9a0d-1138-0063b5a39a87@suse.com>
Message-ID: <aa6d6a67-6889-338a-a910-51e889f792d5@suse.com>
Date:   Wed, 22 Sep 2021 12:17:48 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <0f0db6fa-2604-9a0d-1138-0063b5a39a87@suse.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bXVraHVkZ3VMVEt5bFFlWllWSEpVUjMwQ1RpWXZqUCs5SWtYblNuMGd0ZkJJ?=
 =?utf-8?B?dndQQW9nN2NpRyt3NllkSGRqTWZFUXZoYkIwVzNEZWlOWnZpSUtWM1pCRTBZ?=
 =?utf-8?B?OVpHbk1xeGtGMzRvNnpObHUyNWZUVnNydFdvRlYxaXl3YkFselRHNWQ4Y3hl?=
 =?utf-8?B?Qy92VEVWc1BRT2VwU204T0xSSTNjZERXUUViN3d4WTNxNnFDRjVoVE1rcmNF?=
 =?utf-8?B?WU9WaklqZDdRWVFRRGtNVnA1Ykk4TEd3L3ZMaHVzUW10aElTU0dmd2RYVExl?=
 =?utf-8?B?aDFkSThNUzZrQkVZbHRkQ1I5b3A0THVnMVlIRkIrc3dBMjFYdTBEK3JlNG1N?=
 =?utf-8?B?QjJSbENTTWYxOXNaUTJxaEdEUjloQzVQc3o2QTIranVwaVlhc1FHNEtXd0RX?=
 =?utf-8?B?SGhKY2V1MXRwN1c1U2t5QStwOGhNaDlWamRvTlFEQjhVQ2pCU2xjWFpldnBU?=
 =?utf-8?B?dnpPSWR6UjUyU25zaFdVa2NteXowd2dLMHprdE8yVHlzblVlRzNsTndhMU53?=
 =?utf-8?B?clpEZGlvaHdvTUdZcVgzbDdYVy9NbFEyZ1dZSmZxOVVvN3ZXY1ZSQ3hkZS9m?=
 =?utf-8?B?WWlML2swd0E5M1VJTHVzcEZ5NUVVSU8wNllKZW9abEZwdGpBU25KQ0xPZVdy?=
 =?utf-8?B?R3dQMFMzN01EL3Nrd01HakI5aUR2V3hXcmp6U3VsaXhjZkVxZlY0NXozRnJG?=
 =?utf-8?B?RitoZzVwRUJIQkVYWHRRVXU4Y3F6bmg5c0UrdENrU1JqeERMVmFybkEvc1Mz?=
 =?utf-8?B?NWtPSXh1RE51aDFpOVlEMlpRRFRvTllrVk9SczJUQjRLd2lzbGZ6azNnTGow?=
 =?utf-8?B?TXhTeXROMW5DbmFVNTFsWWZtdE16QkNIRHNDRjNhbXdieEk0TW1sK1Rhd0ln?=
 =?utf-8?B?VlFuZGViSnVpcDhVMVEwdThnRVFLRzAyU2d0ZEw1c1kxYmZjZWdmOVVGVysr?=
 =?utf-8?B?V3FpL1FxK1hoL1ZpQS8yaU1PeDVZVExZeklzNTZTTkczRFRndWQzZGhObGdq?=
 =?utf-8?B?T1o2Rjk1SWc4NGk0R0tlbDFReFFzS2dUNzQ4VURkUENKclVMV0M5ZjU1WmVl?=
 =?utf-8?B?eHpydFV3cWxSbmVqSGJubm1BMjYzN0ttelNLNjVQd21KRnllc1hNU2hFSFJF?=
 =?utf-8?B?c09TOFFldlhSTGYzT3ZmakV3TklkbEZDVUcrZGJiS3ZTaGJ4TW5JS096VEFG?=
 =?utf-8?B?VnUvcDgrampoQUpXOXhPc3NaMjhQS3lWOU0zYzlmSHoxUEY4YmFKcWs2SUc0?=
 =?utf-8?B?QmdFaVVpd04wUWRDQ2lzN2VkeGRCR0ZjeVdxeElmRk9ZckYxQjlxNmFzRTJM?=
 =?utf-8?B?c1pRNVhDSmRkYUcrY0ZrendUY0V1WVkzMFdBdXhBYktQMFhwT244U292Q1lN?=
 =?utf-8?B?NVlrNDZhVitVKzcwTGRrVGV3bmZ2UnlwUzB5UEg2TEt3L05UZHdyMVBVU0tx?=
 =?utf-8?B?aVk3cVQ0MkhJdDRDM3oyZ0lsYmJmY2JnSGpMSDczWUpFaXNKNnZIWUF5clIw?=
 =?utf-8?B?K1R3Qk9oUjNtL1hUMDIyNzJGTTBGVlV3MUNzSUNHbEVGaFlwc29ORHNEQUxu?=
 =?utf-8?B?SHh1VnRXR3FTMTAra3M0d1lnMDZMTUFDeCsrUWg0RjFCaTdoRXZhNlZ2c0tW?=
 =?utf-8?B?UzZDeFZVTjIwUWc4R2s5UHAyWlE3MlBEZUl4bVVUbnlseEhOYTRBVTlwUngz?=
 =?utf-8?B?UzcrUm82MkNWSk5hUlA0MThKYzEwTW9YQ285b2V2VW9xNGk0bWJPWVB3SjNt?=
 =?utf-8?Q?1pwRx5AGXYRigAASodJvomU/3WYKujQZgMSnw4I?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d1b81141-4f67-4f24-d285-08d97db23af0
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2021 10:17:49.7196
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: NDo1bw6H6EUu5BGCJ1Go3BIGApuV6ybSkpmaX66Us4ciSMCt68Qt/1TjQbAqHv81H+OmiaLXjUSECrn3AZGO6g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4190
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

xen_pfn_t is the same size as int only on 32-bit builds (and not even
on Arm32). Hence pfns[] can't be used directly to read individual error
values returned from xen_remap_domain_mfn_array(); every other error
indicator would be skipped/ignored on 64-bit.

Fixes: 3ad0876554ca ("xen/privcmd: add IOCTL_PRIVCMD_MMAP_RESOURCE")
Cc: stable@vger.kernel.org
Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -803,11 +803,12 @@ static long privcmd_ioctl_mmap_resource(
 		unsigned int domid =
 			(xdata.flags & XENMEM_rsrc_acq_caller_owned) ?
 			DOMID_SELF : kdata.dom;
-		int num;
+		int num, *errs = (int *)pfns;
 
+		BUILD_BUG_ON(sizeof(*errs) > sizeof(*pfns));
 		num = xen_remap_domain_mfn_array(vma,
 						 kdata.addr & PAGE_MASK,
-						 pfns, kdata.num, (int *)pfns,
+						 pfns, kdata.num, errs,
 						 vma->vm_page_prot,
 						 domid,
 						 vma->vm_private_data);
@@ -817,7 +818,7 @@ static long privcmd_ioctl_mmap_resource(
 			unsigned int i;
 
 			for (i = 0; i < num; i++) {
-				rc = pfns[i];
+				rc = errs[i];
 				if (rc < 0)
 					break;
 			}