]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
bridge: remove unnecessary check for vtbegin in br_fill_vlan_tinfo_range
authorRoopa Prabhu <roopa@cumulusnetworks.com>
Tue, 7 Feb 2017 14:43:23 +0000 (06:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Feb 2017 19:14:12 +0000 (14:14 -0500)
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>
net/bridge/br_netlink_tunnel.c

index 62eaf750bd9e1866fa5c39e8caf5f6df7c612b97..f38473509647cf47af68afdb45953c792b1289c2 100644 (file)
@@ -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,