* [PATCH v3] NFC: pn544_hci: move the dereference below the NULL test
@ 2012-09-08 13:19 Wei Yongjun
2012-09-19 0:26 ` Samuel Ortiz
0 siblings, 1 reply; 3+ messages in thread
From: Wei Yongjun @ 2012-09-08 13:19 UTC (permalink / raw)
To: lauro.venancio, aloisio.almeida, sameo; +Cc: yongjun_wei, linux-wireless
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
The dereference should be moved below the NULL test.
spatch with a semantic match is used to found this.
(http://coccinelle.lip6.fr/)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/nfc/pn544_hci.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index aa71807..e42b100 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -341,13 +341,16 @@ flush:
static irqreturn_t pn544_hci_irq_thread_fn(int irq, void *dev_id)
{
struct pn544_hci_info *info = dev_id;
- struct i2c_client *client = info->i2c_dev;
+ struct i2c_client *client;
struct sk_buff *skb = NULL;
int r;
- BUG_ON(!info);
- BUG_ON(irq != info->i2c_dev->irq);
+ if (!info || irq != info->i2c_dev->irq) {
+ WARN_ON_ONCE(1);
+ return IRQ_NONE;
+ }
+ client = info->i2c_dev;
dev_dbg(&client->dev, "IRQ\n");
if (info->hard_fault != 0)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v3] NFC: pn544_hci: move the dereference below the NULL test
@ 2012-09-10 14:18 Wei Yongjun
0 siblings, 0 replies; 3+ messages in thread
From: Wei Yongjun @ 2012-09-10 14:18 UTC (permalink / raw)
To: lauro.venancio, aloisio.almeida, sameo, Larry.Finger, kvalo
Cc: yongjun_wei, linux-wireless
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
The dereference should be moved below the NULL test.
spatch with a semantic match is used to found this.
(http://coccinelle.lip6.fr/)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/nfc/pn544_hci.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index aa71807..ed3918c 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -341,13 +341,17 @@ flush:
static irqreturn_t pn544_hci_irq_thread_fn(int irq, void *dev_id)
{
struct pn544_hci_info *info = dev_id;
- struct i2c_client *client = info->i2c_dev;
+ struct i2c_client *client;
struct sk_buff *skb = NULL;
int r;
- BUG_ON(!info);
- BUG_ON(irq != info->i2c_dev->irq);
+ if (WARN_ON_ONCE(!info))
+ return IRQ_NONE;
+
+ if (WARN_ON_ONCE(irq != info->i2c_dev->irq))
+ return IRQ_NONE;
+ client = info->i2c_dev;
dev_dbg(&client->dev, "IRQ\n");
if (info->hard_fault != 0)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] NFC: pn544_hci: move the dereference below the NULL test
2012-09-08 13:19 [PATCH v3] NFC: pn544_hci: move the dereference below the NULL test Wei Yongjun
@ 2012-09-19 0:26 ` Samuel Ortiz
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2012-09-19 0:26 UTC (permalink / raw)
To: Wei Yongjun; +Cc: lauro.venancio, aloisio.almeida, yongjun_wei, linux-wireless
Hi Wei,
On Sat, Sep 08, 2012 at 09:19:44PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> The dereference should be moved below the NULL test.
>
> spatch with a semantic match is used to found this.
> (http://coccinelle.lip6.fr/)
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> drivers/nfc/pn544_hci.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
Applied as well, thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-19 0:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-08 13:19 [PATCH v3] NFC: pn544_hci: move the dereference below the NULL test Wei Yongjun
2012-09-19 0:26 ` Samuel Ortiz
-- strict thread matches above, loose matches on Subject: below --
2012-09-10 14:18 Wei Yongjun
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).