From patchwork Wed Mar 9 09:17:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Cohen X-Patchwork-Id: 6040 Return-path: Envelope-to: mchehab@pedra Delivery-date: Wed, 09 Mar 2011 09:51:16 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1PxIrE-0002yu-8v for mchehab@pedra; Wed, 09 Mar 2011 09:51:16 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Wed, 09 Mar 2011 09:51:16 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PxFWj-00077N-C6; Wed, 09 Mar 2011 09:17:53 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757129Ab1CIJRs (ORCPT + 1 other); Wed, 9 Mar 2011 04:17:48 -0500 Received: from mail-ew0-f46.google.com ([209.85.215.46]:46631 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757075Ab1CIJRp (ORCPT ); Wed, 9 Mar 2011 04:17:45 -0500 Received: by ewy4 with SMTP id 4so92250ewy.19 for ; Wed, 09 Mar 2011 01:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=oDkxU7irRAr8bu2Z/b4YEgvhJzzPsf94EifG5SoBuQQ=; b=aZmdhu7W47wJc62rYtBllCTdHZZVoWvEUcqnJFL6FWmx166+MLll34UlTnJrRiXpZt JWAbrWFkvqxeJUJ7oizaQDe7354rrTQHTVeZeWW2/UgJUhW7I94WK9BjKdwyfVdB2RVI 347VcXURo6i5v+9dFSSzuXXS2znH4pMdiZBCo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=of2wYqO8lBCS0Ps1FJWNNVL6Jn3JM5e4/l40vv1eFBvcU3aVngwnzlWy/zNPyZ1B/3 gcBfYGwOMErDFoL7n0zEvstfBY+SDX+xAamvbfHeCz98khS4DHqdrZyIrgYQTMtLt685 8/vgrkSEIC0U2BDI2OZJcqViv9ST1VRbzUBlg= Received: by 10.213.7.197 with SMTP id e5mr2614463ebe.28.1299662264084; Wed, 09 Mar 2011 01:17:44 -0800 (PST) Received: from localhost.localdomain (a91-152-69-14.elisa-laajakaista.fi [91.152.69.14]) by mx.google.com with ESMTPS id t50sm1352630eeh.0.2011.03.09.01.17.41 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Mar 2011 01:17:43 -0800 (PST) From: David Cohen To: Hiroshi.DOYU@nokia.com Cc: linux-omap@vger.kernel.org, linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com, sakari.ailus@maxwell.research.nokia.com, fernando.lugo@ti.com, Michael Jones Subject: [PATCH v3 1/2] omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set Date: Wed, 9 Mar 2011 11:17:32 +0200 Message-Id: <1299662253-29817-2-git-send-email-dacohen@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1299662253-29817-1-git-send-email-dacohen@gmail.com> References: <1299662253-29817-1-git-send-email-dacohen@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: From: Michael Jones commit c7f4ab26e3bcdaeb3e19ec658e3ad9092f1a6ceb allowed mapping the NULL address if da_start==0, which would then not get unmapped. Disallow this again if IOVMF_DA_ANON is set. And spell variable 'alignment' correctly. Signed-off-by: Michael Jones --- arch/arm/plat-omap/iovmm.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index 6dc1296..ea7eab9 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -271,20 +271,21 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da, size_t bytes, u32 flags) { struct iovm_struct *new, *tmp; - u32 start, prev_end, alignement; + u32 start, prev_end, alignment; if (!obj || !bytes) return ERR_PTR(-EINVAL); start = da; - alignement = PAGE_SIZE; + alignment = PAGE_SIZE; if (flags & IOVMF_DA_ANON) { - start = obj->da_start; + /* Don't map address 0 */ + start = obj->da_start ? obj->da_start : alignment; if (flags & IOVMF_LINEAR) - alignement = iopgsz_max(bytes); - start = roundup(start, alignement); + alignment = iopgsz_max(bytes); + start = roundup(start, alignment); } else if (start < obj->da_start || start > obj->da_end || obj->da_end - start < bytes) { return ERR_PTR(-EINVAL); @@ -304,7 +305,7 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da, goto found; if (tmp->da_end >= start && flags & IOVMF_DA_ANON) - start = roundup(tmp->da_end + 1, alignement); + start = roundup(tmp->da_end + 1, alignment); prev_end = tmp->da_end; }