[Bridge] [PATCH net-next] bridge: remove unnecessary check for vtbegin in br_fill_vlan_tinfo_range
Roopa Prabhu
roopa at cumulusnetworks.com
Tue Feb 7 14:43:23 UTC 2017
From: Roopa Prabhu <roopa at cumulusnetworks.com>
vtbegin should not be NULL in this function, Its already checked by the
caller.
this should silence the below smatch complaint:
net/bridge/br_netlink_tunnel.c:144 br_fill_vlan_tinfo_range()
error: we previously assumed 'vtbegin' could be null (see line 130)
net/bridge/br_netlink_tunnel.c
129
130 if (vtbegin && vtend && (vtend->vid - vtbegin->vid) > 0) {
^^^^^^^
Check for NULL.
Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support")
Reported-By: Dan Carpenter <dan.carpenter at oracle.com>
Signed-off-by: Roopa Prabhu <roopa at cumulusnetworks.com>
---
net/bridge/br_netlink_tunnel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c
index 99c6801..4c1303b 100644
--- a/net/bridge/br_netlink_tunnel.c
+++ b/net/bridge/br_netlink_tunnel.c
@@ -127,7 +127,7 @@ static int br_fill_vlan_tinfo_range(struct sk_buff *skb,
{
int err;
- if (vtbegin && vtend && (vtend->vid - vtbegin->vid) > 0) {
+ if (vtend && (vtend->vid - vtbegin->vid) > 0) {
/* add range to skb */
err = br_fill_vlan_tinfo(skb, vtbegin->vid,
vtbegin->tinfo.tunnel_id,
--
1.7.10.4
More information about the Bridge
mailing list