From patchwork Tue Mar 8 20:15:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Cohen X-Patchwork-Id: 6037 Return-path: Envelope-to: mchehab@pedra Delivery-date: Tue, 08 Mar 2011 17:16:55 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1Px3Kw-0000ml-TL for mchehab@pedra; Tue, 08 Mar 2011 17:16:55 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Tue, 08 Mar 2011 17:16:54 -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 1Px3Jh-0004MM-Bx; Tue, 08 Mar 2011 20:15:37 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756062Ab1CHUPd (ORCPT + 1 other); Tue, 8 Mar 2011 15:15:33 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:48929 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755784Ab1CHUPa (ORCPT ); Tue, 8 Mar 2011 15:15:30 -0500 Received: by mail-ey0-f174.google.com with SMTP id 24so2180490eyx.19 for ; Tue, 08 Mar 2011 12:15:30 -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=Gqu6AG10rgM2/WJuBOqoo9435kxJI+3Vj1eGM/LqQ1I=; b=i6XVfJW+hZ3MaCYrJgOeDzAMSQJYOPP7u4xBmCq7XN/8z37ZDpiWHrQQop5sli0Gef 1avoyNe548LjwTlKAHJrByIXy1Ei5IYFTVAl2jDHi0usj7bkc4h0zhKk2DlkFDEFHmd2 quLKcI8pwWl/plfvX5COKUzZkMrKgE5vjhkBg= 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=qkMESS1arKhjWeuf/p4sgNQeSckcwPtZmJSiS+24c5xNuxgO9nsYDkFRVP5yE6RqBK kYpofmOBJUqrLlCknodF/sCD4e3UwFbuTdDkZfZJ/9i8E5T0g1tLXhfzUQNCw28fKlbc XBh6WryusogOT2RJ1qAPDx53qOK86dtE95+Eg= Received: by 10.213.20.67 with SMTP id e3mr3100195ebb.1.1299615329977; Tue, 08 Mar 2011 12:15:29 -0800 (PST) Received: from localhost.localdomain (a91-152-69-14.elisa-laajakaista.fi [91.152.69.14]) by mx.google.com with ESMTPS id x54sm931448eeh.5.2011.03.08.12.15.28 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Mar 2011 12:15:29 -0800 (PST) From: David Cohen To: Hiroshi.DOYU@nokia.com Cc: linux-omap@vger.kernel.org, fernando.lugo@ti.com, linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com, sakari.ailus@maxwell.research.nokia.com, Michael Jones Subject: [PATCH v2 1/3] omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set Date: Tue, 8 Mar 2011 22:15:14 +0200 Message-Id: <1299615316-17512-2-git-send-email-dacohen@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299615316-17512-1-git-send-email-dacohen@gmail.com> References: <1299615316-17512-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 | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index 6dc1296..e5f8341 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -271,20 +271,24 @@ 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 */ + if (obj->da_start) + start = obj->da_start; + else + 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 +308,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; }