Subject: Re: [PATCH] resources: fix call to alignf() in allocate_resource()
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>,
       Yinghai Lu <yhlu.kernel@gmail.com>,
       Jesse Barnes <jbarnes@virtuousgeek.org>, linux-kernel@vger.kernel.org
In-Reply-To: <alpine.LFD.2.00.0912201026570.3712@localhost.localdomain>
References: <20091220095001.GA6029@comet.dominikbrodowski.net>
	 <alpine.LFD.2.00.0912201026570.3712@localhost.localdomain>
Content-Type: text/plain
Date: Sun, 20 Dec 2009 15:12:16 -0700
Message-Id: <1261347136.26429.3.camel@dc7800.home>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1672
Lines: 41

On Sun, 2009-12-20 at 10:33 -0800, Linus Torvalds wrote:
> 
> On Sun, 20 Dec 2009, Dominik Brodowski wrote:
> >
> > The second parameter to alignf() in allocate_resource() must
> > reflect what new resource is attempted to be allocated, else
> > functions like pcibios_align_resource() (at least on x86) or
> > pcmcia_align() can't work correctly.
> > 
> > Commit 1e5ad9679016275d422e36b12a98b0927d76f556 broke this by
> > setting the "new" resource until we're about to return success.
> > To keep the resource untouched when allocate_resource() fails,
> > a "tmp" resource is introduced.
> 
> Ack. That was subtle. 
> 
> That said, maybe a nicer fix to this would be to actually return 'start' 
> from the 'alignf' macro. That "modify the resource inside the alignment 
> function" thing was always pretty ugly.
> 
> And then we'd pass in 'start' instead of 'size' (I have _no_ idea why we 
> pass in 'size' to the alignment function, but whatever).
> 
> We'd still need to pass in the 'struct resource', but that would be so 
> that it can figure out 'flags' (and 'size' if it really needs it) from it, 
> but now it would be for reading only. So we could mark it 'const'.

Ouch, sorry about that, I should have noticed that alignf() can modify
'new' before we know whether we're going to succeed.

Linus' proposal requires more code change, but has the advantage that
future similar mistakes would be less likely.

Bjorn


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/