diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-19 10:18:12 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-19 10:20:41 -0700 |
| commit | c33c888b585fd9ed3770e91588480a0b74e82ad0 (patch) | |
| tree | 7a46c66816268c99a4fb459b9e347aa6e81bbc56 | |
| parent | 1cb6e73c556e8a61d41e531003cf205c16650a02 (diff) | |
| download | linux-3.10-c33c888b585fd9ed3770e91588480a0b74e82ad0.tar.gz linux-3.10-c33c888b585fd9ed3770e91588480a0b74e82ad0.tar.bz2 linux-3.10-c33c888b585fd9ed3770e91588480a0b74e82ad0.zip | |
usbatm: fix potential NULL pointer dereference
The dereference to 'instance' in the debug code should be moved
below the NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/atm/usbatm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 35f10bfe15d..d3527dd8b90 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c @@ -672,9 +672,6 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) struct usbatm_control *ctrl = UDSL_SKB(skb); int err; - vdbg(&instance->usb_intf->dev, "%s called (skb 0x%p, len %u)", __func__, - skb, skb->len); - /* racy disconnection check - fine */ if (!instance || instance->disconnected) { #ifdef DEBUG @@ -684,6 +681,9 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) goto fail; } + vdbg(&instance->usb_intf->dev, "%s called (skb 0x%p, len %u)", __func__, + skb, skb->len); + if (vcc->qos.aal != ATM_AAL5) { atm_rldbg(instance, "%s: unsupported ATM type %d!\n", __func__, vcc->qos.aal); err = -EINVAL; |