Received: by 10.213.65.68 with SMTP id h4csp2020318imn; Thu, 5 Apr 2018 07:41:45 -0700 (PDT) X-Google-Smtp-Source: AIpwx48itQCpuOLbX+sdZ94vhd+4TGz+FiIzYvMvQHhxxgjOGwB5bf7oxTAVJGflYapadnav0Q5n X-Received: by 10.99.116.67 with SMTP id e3mr4943196pgn.369.1522939305615; Thu, 05 Apr 2018 07:41:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522939305; cv=none; d=google.com; s=arc-20160816; b=JE7ko/z5gNEBvB44QVTsKQ0EOKu81ggOA3whhtEBZbqDhqjJ7kzkmAaAN9OxN8mAXc VO1Qy9LqAj972h8xRkiPLpE227ayaQ9HXL32RIcLla+9drd0b0m6feHaZexS944lOeT+ T229VtY2UvtXmfw7QwuPwIou341b+sFYDPmsSYBty3vi4nO0meGTWE0Q3zEOtFefKlgB BxOKoWqkRK1PZH5TZVpM2tpfVhZX5evYGNLhK7qvUHJMO1LxJa/ypAvGGgxvU1yfxyH8 CBEoleuVtLz+ijHoIXXxeDXoglUDZm+9/TfYi+ZG2riNI7xE3FVzI2PPdNsYVcl0bTV/ apoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:subject:cc:to:from:message-id:date :arc-authentication-results; bh=61uaztOyfKZwU9NKrD9m57wjRRgPfC7hoo0IdUuDBYA=; b=NIlu3LtTH5G6Hh3Mry2HJcPHXGcGneXQ4KVuNWi7Us2hoZIw+ODQq28O4u0lJmJWnC 5hqtxwCgEkN35+C2rmsMR+SBngbdYmUlqGDLR5OW+F6l17pPieXvvvqJw/4qgkah02PG qPueYwwSu4vM7MdlIJ56/nZLFa1ltVoQTYYXf66hjKGX9RmqDDEwsiTO5zBhBexLlPR7 WNz0E8rOoAI0uc+wehMXOcsIUlPyG+KnQlcu8PDLesH8NtO/4pGrHJgQVSw2adpefTEH Fh/jmt1+RXovDha4e0SKSRgWdf1NUCg3Kd2nZXlcFD/u1thxGy9QZhlOsZ8g9fT/GTUa BFPA== 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 b184si5487361pgc.795.2018.04.05.07.41.31; Thu, 05 Apr 2018 07:41:45 -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 S1751389AbeDEOkT (ORCPT + 99 others); Thu, 5 Apr 2018 10:40:19 -0400 Received: from mx2.suse.de ([195.135.220.15]:46201 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751179AbeDEOkS (ORCPT ); Thu, 5 Apr 2018 10:40:18 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6FDF6ABEA; Thu, 5 Apr 2018 14:40:16 +0000 (UTC) Date: Thu, 05 Apr 2018 16:40:15 +0200 Message-ID: From: Takashi Iwai To: Ram Pai Cc: Bjorn Helgaas , linux-kernel@vger.kernel.org, Michael Henders Subject: Re: [PATCH] resource: Fix integer overflow at reallocation In-Reply-To: References: <20180402071616.27177-1-tiwai@suse.de> <20180402190903.GH5743@ram.oc3035372033.ibm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 02 Apr 2018 22:35:04 +0200, Takashi Iwai wrote: > > On Mon, 02 Apr 2018 21:09:03 +0200, > Ram Pai wrote: > > > > On Mon, Apr 02, 2018 at 09:16:16AM +0200, Takashi Iwai wrote: > > > We've got a bug report indicating a kernel panic at booting on an > > > x86-32 system, and it turned out to be the invalid resource assigned > > > after reallocation. __find_resource() first aligns the resource start > > > address and resets the end address with start+size-1 accordingly, then > > > checks whether it's contained. Here the end address may overflow the > > > integer, although resource_contains() still returns true because the > > > function validates only start and end address. So this ends up with > > > returning an invalid resource (start > end). > > > > > > There was already an attempt to cover such a problem in the commit > > > 47ea91b4052d ("Resource: fix wrong resource window calculation"), but > > > this case is an overseen one. > > > > > > This patch adds the validity check of the newly calculated resource > > > for avoiding the integer overflow problem. > > > > Should we move this check "alloc.start <= alloc.end" into resource_contains()? > > Doing so will catch all uses of such erroneous (overflowing) resources. > > I thought of it, too. OTOH, it's rather a validity check and doesn't > belong to resource_contains() semantics. If the function returns > false, you don't know whether it's an invalid resource or it's really > not contained. > > We may return an error code, but I'm not sure whether such an API > change is needed. Maybe not. FWIW, below is the revised one to move the check into resource_contains(). My concern is, however, that the resource validity check isn't a job of resource_contains(). OTOH, this may avoid other similar cases, so it might be worth. In anyway, if there is no objection, and anyone else doesn't want to take, I'll forward this to Andrew as a poor orphan kid. thanks, Takashi -- 8< -- From: Takashi Iwai Subject: [PATCH v2] resource: Fix integer overflow at reallocation We've got a bug report indicating a kernel panic at booting on an x86-32 system, and it turned out to be the invalid resource assigned after reallocation. __find_resource() first aligns the resource start address and resets the end address with start+size-1 accordingly, then checks whether it's contained. Here the end address may overflow the integer, although resource_contains() still returns true because the function validates only start and end address. So this ends up with returning an invalid resource (start > end). There was already an attempt to cover such a problem in the commit 47ea91b4052d ("Resource: fix wrong resource window calculation"), but this case is an overseen one. This patch adds the validity check in resource_contains() to see whether the given resource has a valid range for avoiding the integer overflow problem. Bugzilla: http://bugzilla.opensuse.org/show_bug.cgi?id=1086739 Fixes: 23c570a67448 ("resource: ability to resize an allocated resource") Reported-and-tested-by: Michael Henders Cc: Signed-off-by: Takashi Iwai --- include/linux/ioport.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/ioport.h b/include/linux/ioport.h index da0ebaec25f0..466d7be046eb 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -212,6 +212,9 @@ static inline bool resource_contains(struct resource *r1, struct resource *r2) return false; if (r1->flags & IORESOURCE_UNSET || r2->flags & IORESOURCE_UNSET) return false; + /* sanity check whether it's a valid resource range */ + if (r2->end < r2->start) + return false; return r1->start <= r2->start && r1->end >= r2->end; } -- 2.16.3