mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Julia Lawall <julia@diku.dk>
To: Dan Williams <dan.j.williams@intel.com>
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] drivers/dma: Remove potential NULL dereference
Date: Fri, 27 Aug 2010 07:57:19 +0200	[thread overview]
Message-ID: <1282888640-27042-3-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1282888640-27042-1-git-send-email-julia@diku.dk>

In each case, it appears that the NULL test is not necessary.  In the first
case, the function pl08x_fill_llis_for_desc is only called in a case where
its argument is computed using container_of.  In the second case, the
function pl08x_tasklet is only used as the second argument of tasklet_init,
from which its argument should be the third argument of tasklet_init.  But
that value is not NULL at the point of calling tasklet_init, in
pl08x_dma_init_virtual_channels.

The sematic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@

- T i = E->fld;
+ T i;
  ... when != E
      when != i
  if (E == NULL) S
+ i = E->fld;
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 drivers/dma/amba-pl08x.c |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index fc5aaeb..ac675d2 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -626,11 +626,6 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
 	struct lli *llis_va;
 	struct lli *llis_bus;
 
-	if (!txd) {
-		dev_err(&pl08x->adev->dev, "%s no descriptor\n", __func__);
-		return 0;
-	}
-
 	txd->llis_va = dma_pool_alloc(pl08x->pool, GFP_KERNEL,
 				      &txd->llis_bus);
 	if (!txd->llis_va) {
@@ -1033,9 +1028,6 @@ static void pl08x_tasklet(unsigned long data)
 	struct pl08x_driver_data *pl08x = plchan->host;
 	unsigned long flags;
 
-	if (!plchan)
-		BUG();
-
 	spin_lock_irqsave(&plchan->lock, flags);
 
 	if (plchan->at) {


  parent reply	other threads:[~2010-08-27  5:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-27  5:57 [PATCH 0/3] " Julia Lawall
2010-08-27  5:57 ` [PATCH 1/3] drivers/media/video/em28xx: " Julia Lawall
2010-08-27  5:57 ` Julia Lawall [this message]
2010-08-27  5:57 ` [PATCH 3/3] drivers/staging/tm6000: " Julia Lawall

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1282888640-27042-3-git-send-email-julia@diku.dk \
    --to=julia@diku.dk \
    --cc=dan.j.williams@intel.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®