summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoopa Prabhu <roopa@cumulusnetworks.com>2017-02-07 06:43:23 -0800
committerDavid S. Miller <davem@davemloft.net>2017-02-07 14:14:12 -0500
commita8cab863a75f2d353588d4c3c37dc37c77b96c83 (patch)
treea2b14db32bd6ddd64a08aaa82a4c8188dd5b8861
parent85c727b5948344c8d559e2fda8925e9ddd41c29a (diff)
downloadlinux-a8cab863a75f2d353588d4c3c37dc37c77b96c83.tar.gz
linux-a8cab863a75f2d353588d4c3c37dc37c77b96c83.tar.bz2
linux-a8cab863a75f2d353588d4c3c37dc37c77b96c83.zip
bridge: remove unnecessary check for vtbegin in br_fill_vlan_tinfo_range
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@oracle.com> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bridge/br_netlink_tunnel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c
index 62eaf750bd9e..f38473509647 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,