Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2062558yba; Fri, 19 Apr 2019 11:21:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqyyPvDi9zNWQf5fr6lAXX/j4N3mk8HrSaODZdHZZ7j1r7JHMZi+SerCeZBxYBwYekLtJEI3 X-Received: by 2002:a63:b04b:: with SMTP id z11mr4785450pgo.124.1555698106372; Fri, 19 Apr 2019 11:21:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555698106; cv=none; d=google.com; s=arc-20160816; b=pQKhk71pQIGK+wh6YbT5kiB30w5zprLfkdJtLDLFyFPcHAQqdG/d1PeCcrrLyUkiEr ljdyuMKx9Q4fEg/8gX3qOJ4ggpg/ewZAA2fn6VOXZUBe82+xoz/R93yUwhlLly0hvG5A JBLWMLDM/PjCD75q55AZS9/zoLch+nk7a7UVVm34EjzII25RFxNfJ0xd7WRyBLvs6/Qh PixET7y4dOY6zRiNJDltPMjIkfoJ96lnuxgagRZRY6x8N4VMywhtEezH3WDXdcJMLUcR snCbNP5jYv96A9D16VCgxC1MI+dLuiPtoph6lDbVV6b7pvry1NOqDPAD5neFy55BmFJM U1Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :mime-version:user-agent:date:cc:to:from:subject; bh=Rjjw3fx0Fuflp3V13skrT+4WCUJ8I9pbLxaPokZrMds=; b=su/uHZO1l7/o9dXr4sBSOc7E3RjJuFbSttD7R4XkXewPlsHnG6rg37UuzQUdUH0gFu awGhREjZbhC6XqpOASUEc7a3+5Uu15x3cKS4Fo123a/oX3S16BtubBNLc0kYjRmStGzZ lhdC7HXvfsw5bp6HUb99fzn9OB+i4lsXp19T6pbqxJ0jbH0GBOqZYUiwVYVSFK8/+Xn6 1rTADhXQ9Asuh3TRvvLg9hfKOcaKe8gA7EcZjaXZZNF4R73ESfQAVi75kZf83Au+aVe2 5cBhVK5ukdbzvaulCCg4Lk2kDTMcotA9Q7WY10yrE29RoOdFS4+vwdbgQPqTi0Snlry0 bFiw== ARC-Authentication-Results: i=1; mx.google.com; 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 5si5849207plx.407.2019.04.19.11.21.31; Fri, 19 Apr 2019 11:21:46 -0700 (PDT) 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; 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 S1726985AbfDSSUS (ORCPT + 99 others); Fri, 19 Apr 2019 14:20:18 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43510 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727330AbfDSSUO (ORCPT ); Fri, 19 Apr 2019 14:20:14 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x3JFTb9B126607 for ; Fri, 19 Apr 2019 11:37:24 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2ryf984cg5-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Apr 2019 11:37:23 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 19 Apr 2019 16:37:21 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 19 Apr 2019 16:37:19 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x3JFbIKm59113516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Apr 2019 15:37:18 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B063AE051; Fri, 19 Apr 2019 15:37:18 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 34487AE057; Fri, 19 Apr 2019 15:37:18 +0000 (GMT) Received: from bahia.lan (unknown [9.145.170.150]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 19 Apr 2019 15:37:18 +0000 (GMT) Subject: [PATCH] vfio-pci/nvlink2: Fix potential VMA leak From: Greg Kurz To: linux-kernel@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Alexey Kardashevskiy , Alex Williamson Date: Fri, 19 Apr 2019 17:37:17 +0200 User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 19041915-0028-0000-0000-00000362AB3C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19041915-0029-0000-0000-00002421EF73 Message-Id: <155568823785.601037.2151744205292679252.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-04-19_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=627 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904190114 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If vfio_pci_register_dev_region() fails then we should rollback previous changes, ie. unmap the ATSD registers. Signed-off-by: Greg Kurz --- drivers/vfio/pci/vfio_pci_nvlink2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vfio/pci/vfio_pci_nvlink2.c b/drivers/vfio/pci/vfio_pci_nvlink2.c index 32f695ffe128..50fe3c4f7feb 100644 --- a/drivers/vfio/pci/vfio_pci_nvlink2.c +++ b/drivers/vfio/pci/vfio_pci_nvlink2.c @@ -472,6 +472,8 @@ int vfio_pci_ibm_npu2_init(struct vfio_pci_device *vdev) return 0; free_exit: + if (data->base) + memunmap(data->base); kfree(data); return ret;