]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
net: ipv4: remove erroneous advancement of list pointer
authorFlorian Westphal <fw@strlen.de>
Mon, 17 Jun 2019 14:02:27 +0000 (16:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Jun 2019 23:27:42 +0000 (16:27 -0700)
commit40008e921133f95685ca4dfd7233b3df96af2bd6
tree338373f2866142f36d2f67893f2bebae50f35ed2
parent78fe8a28fb9615c3c255702ed854f7796f266661
net: ipv4: remove erroneous advancement of list pointer

Causes crash when lifetime expires on an adress as garbage is
dereferenced soon after.

This used to look like this:

 for (ifap = &ifa->ifa_dev->ifa_list;
      *ifap != NULL; ifap = &(*ifap)->ifa_next) {
          if (*ifap == ifa) ...

but this was changed to:

struct in_ifaddr *tmp;

ifap = &ifa->ifa_dev->ifa_list;
tmp = rtnl_dereference(*ifap);
while (tmp) {
   tmp = rtnl_dereference(tmp->ifa_next); // Bogus
   if (rtnl_dereference(*ifap) == ifa) {
     ...
   ifap = &tmp->ifa_next; // Can be NULL
   tmp = rtnl_dereference(*ifap); // Dereference
   }
}

Remove the bogus assigment/list entry skip.

Fixes: 2638eb8b50cf ("net: ipv4: provide __rcu annotation for ifa_list")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/devinet.c