Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b9a035f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixes-for-3.9' of git://gitorious.org/linux-can/linux-can 



Marc Kleine-Budde says:

====================
here's a fix for the v3.9 release cycle, if not too late:

Wei Yongjun contributes a patch for the can-gw protocoll. The patch fixes the
memory allocated with kmem_cache_alloc(), is now freed using kmem_cache_free(),
not kfree().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ca10b9e9 3480a212

net/can/gw.c

+3 −3
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int cgw_notifier(struct notifier_block *nb, 
			if (gwj->src.dev == dev || gwj->dst.dev == dev) {

				hlist_del(&gwj->list);

				cgw_unregister_filter(gwj);

				kfree(gwj);

				kmem_cache_free(cgw_cache, gwj);

			}

		}

	}
@@ -864,7 +864,7 @@ static void cgw_remove_all_jobs(void) 
	hlist_for_each_entry_safe(gwj, nx, &cgw_list, list) {

		hlist_del(&gwj->list);

		cgw_unregister_filter(gwj);

		kfree(gwj);

		kmem_cache_free(cgw_cache, gwj);

	}

}
@@ -920,7 +920,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 


		hlist_del(&gwj->list);

		cgw_unregister_filter(gwj);

		kfree(gwj);

		kmem_cache_free(cgw_cache, gwj);

		err = 0;

		break;

	}