The following commit has been merged in the linux branch: commit 60e5c1b5ecd99e06d3133a2a20d58d3c2b9968ac Author: Julia Lawall julia@diku.dk Date: Sat Oct 17 08:42:49 2009 +0200

ARM: S3C24XX: arch/arm/plat-s3c24xx: Move dereference after NULL test

If the NULL test on buf is needed, then the dereference should be after the NULL test.

A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/):

// <smpl> @match exists@ expression x, E; identifier fld; @@

* x->fld ... when != (x = E|&x) * x == NULL // </smpl>

Signed-off-by: Julia Lawall julia@diku.dk Signed-off-by: Ben Dooks ben-linux@fluff.org

diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index 196b191..f046f8c 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c @@ -208,14 +208,14 @@ s3c2410_dma_loadbuffer(struct s3c2410_dma_chan *chan, { unsigned long reload;

- pr_debug("s3c2410_chan_loadbuffer: loading buff %p (0x%08lx,0x%06x)\n", - buf, (unsigned long)buf->data, buf->size); - if (buf == NULL) { dmawarn("buffer is NULL\n"); return -EINVAL; }

+ pr_debug("s3c2410_chan_loadbuffer: loading buff %p (0x%08lx,0x%06x)\n", + buf, (unsigned long)buf->data, buf->size); + /* check the state of the channel before we do anything */

if (chan->load_state == S3C2410_DMALOAD_1LOADED) {