diff options
| author | Robert Shearman <rshearma@brocade.com> | 2015-06-05 18:54:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-07 19:37:27 -0700 |
| commit | 25cc8f0763c972911b1a65099cd10d9f8a45a7b0 (patch) | |
| tree | e50c9fa03a8a7cebad169217faafae8f7996a090 | |
| parent | e51000db4c880165eab06ec0990605f24e75203f (diff) | |
| download | blackbird-op-linux-25cc8f0763c972911b1a65099cd10d9f8a45a7b0.tar.gz blackbird-op-linux-25cc8f0763c972911b1a65099cd10d9f8a45a7b0.zip | |
mpls: fix possible use after free of device
The mpls device is used in an RCU read context without a lock being
held. As the memory is freed without waiting for the RCU grace period
to elapse, the freed memory could still be in use.
Address this by using kfree_rcu to free the memory for the mpls device
after the RCU grace period has elapsed.
Fixes: 03c57747a702 ("mpls: Per-device MPLS state")
Signed-off-by: Robert Shearman <rshearma@brocade.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/mpls/af_mpls.c | 2 | ||||
| -rw-r--r-- | net/mpls/internal.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 7b3f732269e4..bff427f31924 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -541,7 +541,7 @@ static void mpls_ifdown(struct net_device *dev) RCU_INIT_POINTER(dev->mpls_ptr, NULL); - kfree(mdev); + kfree_rcu(mdev, rcu); } static int mpls_dev_notify(struct notifier_block *this, unsigned long event, diff --git a/net/mpls/internal.h b/net/mpls/internal.h index b064c345042c..8cabeb5a1cb9 100644 --- a/net/mpls/internal.h +++ b/net/mpls/internal.h @@ -16,6 +16,7 @@ struct mpls_dev { int input_enabled; struct ctl_table_header *sysctl; + struct rcu_head rcu; }; struct sk_buff; |
