Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp2308896rwb; Thu, 29 Sep 2022 08:38:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4VPj8PIu64eMJwUNVLm4oJfreyu/bweRyv7/Ql2Q3NVyVogwZ2aarxtf+ALibDIA83jweB X-Received: by 2002:a17:906:3197:b0:73d:5e1a:44ac with SMTP id 23-20020a170906319700b0073d5e1a44acmr3152699ejy.512.1664465883394; Thu, 29 Sep 2022 08:38:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664465883; cv=none; d=google.com; s=arc-20160816; b=HlWWb/dZEr7iyHENkb0QgiNXjDW5c175bG0EZYJ+bl1N1kTPsGfA1SpBGH4mqMlkHm fVtfuyb/A1F4AxweVU93JGj9Z6313gLVaADoVDLZEocKgE7vUBnscsaGc6DG+BW5jhBu KmJCN00B9ZaVdgoC9Z9wIZ0ex7c3lotkDSb5NjuSptTb4KctVb3YjSxaDe3e+AlMCOJb DqHrpg7LKaDtZOZrIr19zHjMdvjRujxGslVUAz9knKcLdFEIP+/y8Hxq9v9CGEcmIMjs CTCznrI3hwuH5rkfQMo/1AxIz5D2AIff87nDpGU4Q7XQpZLkmTPSO/09MfYyZpcPDm2B fGKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fM1WyJtdobqmzqolG/DJUsfEKi4rUOObmaLTip65IDw=; b=SkaQyrBL5VO+WZf1u/WlleVYFn8LBPRvqamgf0FpkNzjHxyNVgNfjeddYhhA5MdCGK s9GPMmypLb21KgYXtB/rFvQUCwHy7no8LQe52TKDFddLw/4Ba7y/lYwD0Z+0XtLmM58q O78bdsL4o8TuymumfEV5QxNWIcohbG/r778H9/4E4hvcFdShojNdwWRqiA+kiSKLBfH8 3T4+udPKF+nbdcomaQm0roioXik8qsHKqcxy4e2/V65lhbJsNkUpGRNI9TVAJ6hUwxeK HTnxJBvVGh4YB+TECGJE+Ezg9/mAz/Zx7GeNVbY0/zObGbGgFyz69dJYj5qL3Fat65mw 3X6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=F1TbQbBv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qk17-20020a1709077f9100b00741a0720a2bsi8058236ejc.814.2022.09.29.08.37.36; Thu, 29 Sep 2022 08:38:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=F1TbQbBv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235929AbiI2Pfu (ORCPT + 99 others); Thu, 29 Sep 2022 11:35:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235201AbiI2PeC (ORCPT ); Thu, 29 Sep 2022 11:34:02 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 719701B8683; Thu, 29 Sep 2022 08:33:36 -0700 (PDT) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28TEvdoH008198; Thu, 29 Sep 2022 15:33:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=fM1WyJtdobqmzqolG/DJUsfEKi4rUOObmaLTip65IDw=; b=F1TbQbBveuFVyxYcpzJnNTpjZBAPpf+hKGddshnt9AE9vVXkysnTmyXdCTSl+j11ZXky kOFcxDq3gDz6gXkEFXN9d/yHkKdd8y23QhzQSttTwxMprBUcZI+t28cL+FDK/eQp3a/Y tiTAX7CuLsyCU1lSQ7jntaeGXtrCxvC4QC9X0fpg31mdc8PVIg+nwiFho6lJ2ogPSW0k icl13WHiuxTcy57esXq2zjSxMu8fvrsOvBclshZqM8EYUtLeLIqqa4x/ZdNALoPleLk9 aLzpSm+9B4WhJn9f4IPTCFHUEaRWg9U/OHtt0PjH6bFmJ6fkzsj2HWm5TEwimsMcEX7c EA== Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3jwdk7s73u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Sep 2022 15:33:10 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 28TFMVRk010753; Thu, 29 Sep 2022 15:33:08 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma04fra.de.ibm.com with ESMTP id 3jssh956f9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Sep 2022 15:33:07 +0000 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 28TFX4qL3211964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Sep 2022 15:33:04 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B103CAE045; Thu, 29 Sep 2022 15:33:04 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 39E7EAE04D; Thu, 29 Sep 2022 15:33:04 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 29 Sep 2022 15:33:04 +0000 (GMT) From: Niklas Schnelle To: Matthew Rosato , Pierre Morel , iommu@lists.linux.dev Cc: linux-s390@vger.kernel.org, borntraeger@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, jgg@nvidia.com, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] iommu/s390: Fix incorrect aperture check Date: Thu, 29 Sep 2022 17:33:01 +0200 Message-Id: <20220929153302.3195115-5-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929153302.3195115-1-schnelle@linux.ibm.com> References: <20220929153302.3195115-1-schnelle@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: PsmaGx3EvoSt29E2oexuOyKAsO6WyT_- X-Proofpoint-ORIG-GUID: PsmaGx3EvoSt29E2oexuOyKAsO6WyT_- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-29_08,2022-09-29_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 mlxlogscore=999 priorityscore=1501 phishscore=0 clxscore=1015 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2209290097 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The domain->geometry.aperture_end specifies the last valid address treat it as such when checking if a DMA address is valid. Reviewed-by: Pierre Morel Reviewed-by: Matthew Rosato Signed-off-by: Niklas Schnelle --- drivers/iommu/s390-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c index ed0e64f478cf..6d4a9c7db32c 100644 --- a/drivers/iommu/s390-iommu.c +++ b/drivers/iommu/s390-iommu.c @@ -210,7 +210,7 @@ static int s390_iommu_update_trans(struct s390_domain *s390_domain, int rc = 0; if (dma_addr < s390_domain->domain.geometry.aperture_start || - dma_addr + size > s390_domain->domain.geometry.aperture_end) + dma_addr + size > s390_domain->domain.geometry.aperture_end + 1) return -EINVAL; nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; -- 2.34.1