Commit 4d042654 authored Jul 15, 2014 by Himangi Saraogi Committed by Marcel Holtmann Jul 14, 2014

Bluetooth: cmtp: Remove unnecessary null test



This patch removes the null test on ctrl. ctrl is initialized at the
beginning of the function to &session->ctrl. Since session is
dereferenced prior to the null test, session must be a valid pointer,
and &session->ctrl cannot be null.

The following Coccinelle script is used for detecting the change:

@r@
expression e,f;
identifier g,y;
statement S1,S2;
@@

*e = &f->g
<+...
 f->y
 ...+>
*if (e != NULL || ...)
 S1 else S2

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent b2d5e254

net/bluetooth/cmtp/capi.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -362,12 +362,6 @@ void cmtp_recv_capimsg(struct cmtp_session session, struct sk_buff skb)
		CAPIMSG_SETCONTROL(skb->data, contr);
		}

		if (!ctrl) {
		BT_ERR("Can't find controller %d for message", session->num);
		kfree_skb(skb);
		return;
		}

		capi_ctr_handle_message(ctrl, appl, skb);
		}