Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp175631imu; Sun, 4 Nov 2018 21:58:40 -0800 (PST) X-Google-Smtp-Source: AJdET5eTIOQZhtzxTectHdO63xMVT+L+iS9TLOAQXRVdobHaWdj6OA1rQmNMrzHXusLf7t7ex2EU X-Received: by 2002:a63:cf0e:: with SMTP id j14-v6mr19029474pgg.195.1541397519993; Sun, 04 Nov 2018 21:58:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541397519; cv=none; d=google.com; s=arc-20160816; b=n2TUJXLex4ue6TwVBOssvZqVgpVhZPpeqTrPvBGQNg1Id3GnlboFYC+YsF/ePu+kIP zpcHuScBGoHtm8Xr1ZOgLCEE+EXtuRf3mDrc9rvtTzBBTkmHyq8tgTlq0GcMXajmycIu 4ojxBr9N5ZZ3YWaoJmQio3YTCUjlh6vn0Gzdihn0A34KgV8QJDO0onZb/czEccRL+8Xu xuUc+732872WTs/AM37HmSmZ8yQs6QNQaK35KPxV9kLFMJgnBU7+RJHE122IZRg/H/nL s3TktIiOkjsAZ2tZSLCOJn53oStG6k0SriHjAnbe8UubvRdLpAvYnm6kGK4JeL6wuVZG VfVg== 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:references:in-reply-to:date:subject:to:from; bh=krU9O6Ua3pGGSuT5J6EUVd7uAwr72ZFdbk46bBgnW6M=; b=O9T8SshFNE9Jcdd1YP6ZsTRD2Z5/j2hFwWDy7sslR4dM1MBMnU2wSWMzTngRV+d66V a5yDIVcxt/zUF3yDQNbMkOxG8CNg1Z7j+adeNrILfqNYdN8YSutbbS2mf0mSJcq6jXCG BkZEPfESsQGdYxzhStKwaPbY2aoSmV0/KyudBBGuPtzOwY8Hvma/VLqQK2tTmtPCM2iS IUpO+uSkuqEOypAZQIuMem+rhlBEYVucq/9rXjYYFCKHpCpDcVpV0GooPiRz/I1fn+ow SDIfSQVCYW2SPEPqNjnxj+DZCAzPrT6xgZ0KO8gLnE2HoKR0ixKqUCRG96JaIPz0Guuf syTQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h13-v6si49361426plk.130.2018.11.04.21.58.25; Sun, 04 Nov 2018 21:58:39 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729321AbeKEPP4 (ORCPT + 99 others); Mon, 5 Nov 2018 10:15:56 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:39110 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728653AbeKEPPz (ORCPT ); Mon, 5 Nov 2018 10:15:55 -0500 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wA55rlZv012393 for ; Mon, 5 Nov 2018 00:57:56 -0500 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2njfrhgrd0-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 05 Nov 2018 00:57:56 -0500 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 5 Nov 2018 05:57:54 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 5 Nov 2018 05:57:52 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wA55vpCw4129228 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 5 Nov 2018 05:57:51 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4C73C5204F; Mon, 5 Nov 2018 05:57:51 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id EDBBE5205A; Mon, 5 Nov 2018 05:57:50 +0000 (GMT) Received: from tungsten.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 89323A0257; Mon, 5 Nov 2018 16:57:48 +1100 (AEDT) From: Sam Bobroff To: airlied@redhat.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] drm/ast: Fix incorrect free on ioregs Date: Mon, 5 Nov 2018 16:57:47 +1100 X-Mailer: git-send-email 2.19.0.2.gcad72f5712 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 18110505-0012-0000-0000-000002C35A17 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18110505-0013-0000-0000-000020F796C8 Message-Id: <9e419efe28abb38b3935ee33d886630be43f0bf3.1541397462.git.sbobroff@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-11-05_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=868 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811050053 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the platform has no IO space, ioregs is placed next to the already allocated regs. In this case, it should not be separately freed. This prevents a kernel warning from __vunmap "Trying to vfree() nonexistent vm area" when unloading the driver. Fixes: 0dd68309b9c5 ("drm/ast: Try to use MMIO registers when PIO isn't supported") Signed-off-by: Sam Bobroff --- drivers/gpu/drm/ast/ast_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index dac355812adc..373700c05a00 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -583,7 +583,8 @@ void ast_driver_unload(struct drm_device *dev) drm_mode_config_cleanup(dev); ast_mm_fini(ast); - pci_iounmap(dev->pdev, ast->ioregs); + if (ast->ioregs != ast->regs + AST_IO_MM_OFFSET) + pci_iounmap(dev->pdev, ast->ioregs); pci_iounmap(dev->pdev, ast->regs); kfree(ast); } -- 2.19.0.2.gcad72f5712