Skip to contentSkip to conversation

can: raw: add missing refcount for memory leak fix

RFC PATCH In review Oliver Hartkopp 2 participants 5 messages Aug 4, 2023 – Aug 15, 2023

Subsystems (2)
lore
Share & tools
lore

Oliver Hartkopp

author maintainer
#0 lore raw

RFC PATCH 1/1 can: raw: add missing refcount for memory leak fix

Commit ee8b94c8510c ("can: raw: fix receiver memory leak") introduced a new reference to the CAN netdevice that has assigned CAN filters. But this new ro->dev reference did not maintain its own refcount which lead to another KASAN use-after-free splat found by Eric Dumazet.

This patch ensures a proper refcount for the CAN nedevice.

Fixes ee8b94c8510c ("can: raw: fix receiver memory leak")
Cc Ziyang Xuan <[email protected]>
---
 net/can/raw.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)
net/can/raw.c +21 -10
index e10f59375659..a61c417fdd27 100644
@@ -283,12 +283,14 @@ static void raw_notify(struct raw_sock *ro, unsigned long msg,
 
 	switch (msg) {
 	case NETDEV_UNREGISTER:
 		lock_sock(sk);
 		/* remove current filters & unregister */
-		if (ro->bound)
+		if (ro->bound) {
 			raw_disable_allfilters(dev_net(dev), dev, sk);
+			dev_put(dev);
+		}
 
 		if (ro->count > 1)
 			kfree(ro->filter);
 
 		ro->ifindex = 0;
@@ -389,14 +391,16 @@ static int raw_release(struct socket *sock)
 	rtnl_lock();
 	lock_sock(sk);
 
 	/* remove current filters & unregister */
 	if (ro->bound) {
-		if (ro->dev)
+		if (ro->dev) {
 			raw_disable_allfilters(dev_net(ro->dev), ro->dev, sk);
-		else
+			dev_put(ro->dev);
+		} else {
 			raw_disable_allfilters(sock_net(sk), NULL, sk);
+		}
 	}
 
 	if (ro->count > 1)
 		kfree(ro->filter);
 
@@ -447,36 +451,43 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
 		if (dev->type != ARPHRD_CAN) {
 			dev_put(dev);
 			err = -ENODEV;
 			goto out;
 		}
-		if (!(dev->flags & IFF_UP))
-			notify_enetdown = 1;
-
-		ifindex = dev->ifindex;
 
 		/* filters set by default/setsockopt */
 		err = raw_enable_allfilters(sock_net(sk), dev, sk);
-		dev_put(dev);
+		if (err) {
+			dev_put(dev);
+			goto out;
+		}
+
+		ifindex = dev->ifindex;
+		if (!(dev->flags & IFF_UP))
+			notify_enetdown = 1;
 	} else {
 		ifindex = 0;
 
 		/* filters set by default/setsockopt */
 		err = raw_enable_allfilters(sock_net(sk), NULL, sk);
 	}
 
 	if (!err) {
 		if (ro->bound) {
 			/* unregister old filters */
-			if (ro->dev)
+			if (ro->dev) {
 				raw_disable_allfilters(dev_net(ro->dev),
 						       ro->dev, sk);
-			else
+				/* drop reference to old ro->dev */
+				dev_put(ro->dev);
+			} else {
 				raw_disable_allfilters(sock_net(sk), NULL, sk);
+			}
 		}
 		ro->ifindex = ifindex;
 		ro->bound = 1;
+		/* bind() ok -> holding a reference to new ro->dev */
 		ro->dev = dev;
 	}
 
  out:
 	release_sock(sk);
Signature · 1 line
2.39.2
#1 lore raw
Quoted 7 lines · Oliver Hartkopp

Commit ee8b94c8510c ("can: raw: fix receiver memory leak") introduced a new reference to the CAN netdevice that has assigned CAN filters. But this new ro->dev reference did not maintain its own refcount which lead to another KASAN use-after-free splat found by Eric Dumazet.

This patch ensures a proper refcount for the CAN nedevice.

Hi Olivier

I would feel a bit safer with new longterm device references if you could add an ro->dev_tracker and use netdev_put() netdev_hold() and friends ;)

Thanks !

Quoted 102 lines
Fixes ee8b94c8510c ("can: raw: fix receiver memory leak")
Cc Ziyang Xuan <[email protected]>
---
 net/can/raw.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)
net/can/raw.c +21 -11
index e10f59375659..a61c417fdd27 100644
@@ -283,12 +283,14 @@ static void raw_notify(struct raw_sock *ro, unsigned long msg,
 
        switch (msg) {
        case NETDEV_UNREGISTER:
                lock_sock(sk);
                /* remove current filters & unregister */
-               if (ro->bound)
+               if (ro->bound) {
                        raw_disable_allfilters(dev_net(dev), dev, sk);
+                       dev_put(dev);
+               }
 
                if (ro->count > 1)
                        kfree(ro->filter);
 
                ro->ifindex = 0;
@@ -389,14 +391,16 @@ static int raw_release(struct socket *sock)
        rtnl_lock();
        lock_sock(sk);
 
        /* remove current filters & unregister */
        if (ro->bound) {
-               if (ro->dev)
+               if (ro->dev) {
                        raw_disable_allfilters(dev_net(ro->dev), ro->dev, sk);
-               else
+                       dev_put(ro->dev);
+               } else {
                        raw_disable_allfilters(sock_net(sk), NULL, sk);
+               }
        }
 
        if (ro->count > 1)
                kfree(ro->filter);
 
@@ -447,36 +451,43 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
                if (dev->type != ARPHRD_CAN) {
                        dev_put(dev);
                        err = -ENODEV;
                        goto out;
                }
-               if (!(dev->flags & IFF_UP))
-                       notify_enetdown = 1;
-
-               ifindex = dev->ifindex;
 
                /* filters set by default/setsockopt */
                err = raw_enable_allfilters(sock_net(sk), dev, sk);
-               dev_put(dev);
+               if (err) {
+                       dev_put(dev);
+                       goto out;
+               }
+
+               ifindex = dev->ifindex;
+               if (!(dev->flags & IFF_UP))
+                       notify_enetdown = 1;
        } else {
                ifindex = 0;
 
                /* filters set by default/setsockopt */
                err = raw_enable_allfilters(sock_net(sk), NULL, sk);
        }
 
        if (!err) {
                if (ro->bound) {
                        /* unregister old filters */
-                       if (ro->dev)
+                       if (ro->dev) {
                                raw_disable_allfilters(dev_net(ro->dev),
                                                       ro->dev, sk);
-                       else
+                               /* drop reference to old ro->dev */
+                               dev_put(ro->dev);
+                       } else {
                                raw_disable_allfilters(sock_net(sk), NULL, sk);
+                       }
                }
                ro->ifindex = ifindex;
                ro->bound = 1;
+               /* bind() ok -> holding a reference to new ro->dev */
                ro->dev = dev;
        }
 
  out:
        release_sock(sk);
--

2.39.2

author maintainer
#2 lore raw
Quoted 9 lines · Eric Dumazet
Quoted 7 lines · Oliver Hartkopp

Commit ee8b94c8510c ("can: raw: fix receiver memory leak") introduced a new reference to the CAN netdevice that has assigned CAN filters. But this new ro->dev reference did not maintain its own refcount which lead to another KASAN use-after-free splat found by Eric Dumazet.

This patch ensures a proper refcount for the CAN nedevice.

Quoted 8 lines

Hi Olivier

I would feel a bit safer with new longterm device references if you could add an ro->dev_tracker and use netdev_put() netdev_hold() and friends ;)

Thanks !

Hi Eric,

the netdev_hold() mechanic has been introduced in Linux 6.0.

Would it make sense to take this patch as fix for all the current stable kernels and move to the dev-tracker as improvement via net-next as usual?

Best,
Oliver

Quoted 102 lines
Quoted 102 lines
Fixes ee8b94c8510c ("can: raw: fix receiver memory leak")
Cc Ziyang Xuan <[email protected]>
---
  net/can/raw.c | 31 +++++++++++++++++++++----------
  1 file changed, 21 insertions(+), 10 deletions(-)
net/can/raw.c +21 -11
index e10f59375659..a61c417fdd27 100644
@@ -283,12 +283,14 @@ static void raw_notify(struct raw_sock *ro, unsigned long msg,
 
         switch (msg) {
         case NETDEV_UNREGISTER:
                 lock_sock(sk);
                 /* remove current filters & unregister */
-               if (ro->bound)
+               if (ro->bound) {
                         raw_disable_allfilters(dev_net(dev), dev, sk);
+                       dev_put(dev);
+               }
 
                 if (ro->count > 1)
                         kfree(ro->filter);
 
                 ro->ifindex = 0;
@@ -389,14 +391,16 @@ static int raw_release(struct socket *sock)
         rtnl_lock();
         lock_sock(sk);
 
         /* remove current filters & unregister */
         if (ro->bound) {
-               if (ro->dev)
+               if (ro->dev) {
                         raw_disable_allfilters(dev_net(ro->dev), ro->dev, sk);
-               else
+                       dev_put(ro->dev);
+               } else {
                         raw_disable_allfilters(sock_net(sk), NULL, sk);
+               }
         }
 
         if (ro->count > 1)
                 kfree(ro->filter);
 
@@ -447,36 +451,43 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
                 if (dev->type != ARPHRD_CAN) {
                         dev_put(dev);
                         err = -ENODEV;
                         goto out;
                 }
-               if (!(dev->flags & IFF_UP))
-                       notify_enetdown = 1;
-
-               ifindex = dev->ifindex;
 
                 /* filters set by default/setsockopt */
                 err = raw_enable_allfilters(sock_net(sk), dev, sk);
-               dev_put(dev);
+               if (err) {
+                       dev_put(dev);
+                       goto out;
+               }
+
+               ifindex = dev->ifindex;
+               if (!(dev->flags & IFF_UP))
+                       notify_enetdown = 1;
         } else {
                 ifindex = 0;
 
                 /* filters set by default/setsockopt */
                 err = raw_enable_allfilters(sock_net(sk), NULL, sk);
         }
 
         if (!err) {
                 if (ro->bound) {
                         /* unregister old filters */
-                       if (ro->dev)
+                       if (ro->dev) {
                                 raw_disable_allfilters(dev_net(ro->dev),
                                                        ro->dev, sk);
-                       else
+                               /* drop reference to old ro->dev */
+                               dev_put(ro->dev);
+                       } else {
                                 raw_disable_allfilters(sock_net(sk), NULL, sk);
+                       }
                 }
                 ro->ifindex = ifindex;
                 ro->bound = 1;
+               /* bind() ok -> holding a reference to new ro->dev */
                 ro->dev = dev;
         }
 
   out:
         release_sock(sk);
--

2.39.2

#3 lore raw
Quoted 22 lines · Oliver Hartkopp
Quoted 9 lines · Eric Dumazet
Quoted 7 lines · Oliver Hartkopp

Commit ee8b94c8510c ("can: raw: fix receiver memory leak") introduced a new reference to the CAN netdevice that has assigned CAN filters. But this new ro->dev reference did not maintain its own refcount which lead to another KASAN use-after-free splat found by Eric Dumazet.

This patch ensures a proper refcount for the CAN nedevice.

Quoted 8 lines

Hi Olivier

I would feel a bit safer with new longterm device references if you could add an ro->dev_tracker and use netdev_put() netdev_hold() and friends ;)

Thanks !

Quoted 6 lines

Hi Eric,

the netdev_hold() mechanic has been introduced in Linux 6.0.

Would it make sense to take this patch as fix for all the current stable kernels and move to the dev-tracker as improvement via net-next as usual?

Good question.

My take on this, but others might disagree :

I think it is better to cook a patch for current upstream kernels.

Then we will adapt it when backporting to old ones, it should be relatively easy.

author maintainer
#4 lore raw

Hello Eric,

Quoted 16 lines · Eric Dumazet
Quoted 9 lines
Quoted 8 lines

Hi Olivier

I would feel a bit safer with new longterm device references if you could add an ro->dev_tracker and use netdev_put() netdev_hold() and friends ;)

Thanks !

Quoted 6 lines

Hi Eric,

the netdev_hold() mechanic has been introduced in Linux 6.0.

Would it make sense to take this patch as fix for all the current stable kernels and move to the dev-tracker as improvement via net-next as usual?

Quoted 8 lines

Good question.

My take on this, but others might disagree :

I think it is better to cook a patch for current upstream kernels.

Then we will adapt it when backporting to old ones, it should be relatively easy.

I implemented both versions with dev tracker and without dev tracker.

It was just the renaming of (net)dev_[hold|put] and having the dev_tracker element in the raw_sock data structure.

The new patch is here:
https://lore.kernel.org/linux-can/[email protected]/T/#u

I would appreciate if you could take a short look at it.

Many thanks,
Oliver