Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1311293 > unrolled thread
| Started by | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| First post | 2016-01-18 04:40 +0100 |
| Last post | 2016-01-18 13:00 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 3.2 42/70] net: possible use after free in dst_release Ben Hutchings <ben@decadent.org.uk> - 2016-01-18 04:40 +0100
Re: [PATCH 3.2 42/70] net: possible use after free in dst_release Francesco Ruggeri <fruggeri@arista.com> - 2016-01-18 04:50 +0100
Re: [PATCH 3.2 42/70] net: possible use after free in dst_release Ben Hutchings <ben@decadent.org.uk> - 2016-01-18 13:00 +0100
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2016-01-18 04:40 +0100 |
| Subject | [PATCH 3.2 42/70] net: possible use after free in dst_release |
| Message-ID | <qS8PG-3ml-79@gated-at.bofh.it> |
3.2.76-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Francesco Ruggeri <fruggeri@aristanetworks.com>
commit 07a5d38453599052aff0877b16bb9c1585f08609 upstream.
dst_release should not access dst->flags after decrementing
__refcnt to 0. The dst_entry may be in dst_busy_list and
dst_gc_task may dst_destroy it before dst_release gets a chance
to access dst->flags.
Fixes: d69bbf88c8d0 ("net: fix a race in dst_release()")
Fixes: 27b75c95f10d ("net: avoid RCU for NOCACHE dst")
Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
net/core/dst.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -269,10 +269,11 @@ void dst_release(struct dst_entry *dst)
{
if (dst) {
int newrefcnt;
+ unsigned short nocache = dst->flags & DST_NOCACHE;
newrefcnt = atomic_dec_return(&dst->__refcnt);
WARN_ON(newrefcnt < 0);
- if (!newrefcnt && unlikely(dst->flags & DST_NOCACHE)) {
+ if (!newrefcnt && unlikely(nocache)) {
dst = dst_destroy(dst);
if (dst)
__dst_free(dst);
[toc] | [next] | [standalone]
| From | Francesco Ruggeri <fruggeri@arista.com> |
|---|---|
| Date | 2016-01-18 04:50 +0100 |
| Message-ID | <qS8Zk-3pH-15@gated-at.bofh.it> |
| In reply to | #1311293 |
On Sun, Jan 17, 2016 at 7:18 PM, Ben Hutchings <ben@decadent.org.uk> wrote:
> 3.2.76-rc1 review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Francesco Ruggeri <fruggeri@aristanetworks.com>
>
> commit 07a5d38453599052aff0877b16bb9c1585f08609 upstream.
>
> dst_release should not access dst->flags after decrementing
> __refcnt to 0. The dst_entry may be in dst_busy_list and
> dst_gc_task may dst_destroy it before dst_release gets a chance
> to access dst->flags.
>
> Fixes: d69bbf88c8d0 ("net: fix a race in dst_release()")
> Fixes: 27b75c95f10d ("net: avoid RCU for NOCACHE dst")
> Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
> Acked-by: Eric Dumazet <edumazet@google.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> [bwh: Backported to 3.2: adjust context]
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
> net/core/dst.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- a/net/core/dst.c
> +++ b/net/core/dst.c
> @@ -269,10 +269,11 @@ void dst_release(struct dst_entry *dst)
> {
> if (dst) {
> int newrefcnt;
> + unsigned short nocache = dst->flags & DST_NOCACHE;
Only one minor thing. Before 3.6 dst->flags was an int.
Thanks,
Francesco
>
> newrefcnt = atomic_dec_return(&dst->__refcnt);
> WARN_ON(newrefcnt < 0);
> - if (!newrefcnt && unlikely(dst->flags & DST_NOCACHE)) {
> + if (!newrefcnt && unlikely(nocache)) {
> dst = dst_destroy(dst);
> if (dst)
> __dst_free(dst);
>
[toc] | [prev] | [next] | [standalone]
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2016-01-18 13:00 +0100 |
| Message-ID | <qSgDw-7n-3@gated-at.bofh.it> |
| In reply to | #1311302 |
[Multipart message — attachments visible in raw view] — view raw
On Sun, 2016-01-17 at 19:49 -0800, Francesco Ruggeri wrote:
> On Sun, Jan 17, 2016 at 7:18 PM, Ben Hutchings <ben@decadent.org.uk> wrote:
> > 3.2.76-rc1 review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Francesco Ruggeri <fruggeri@aristanetworks.com>
> >
> > commit 07a5d38453599052aff0877b16bb9c1585f08609 upstream.
> >
> > dst_release should not access dst->flags after decrementing
> > __refcnt to 0. The dst_entry may be in dst_busy_list and
> > dst_gc_task may dst_destroy it before dst_release gets a chance
> > to access dst->flags.
> >
> > Fixes: d69bbf88c8d0 ("net: fix a race in dst_release()")
> > Fixes: 27b75c95f10d ("net: avoid RCU for NOCACHE dst")
> > Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
> > Acked-by: Eric Dumazet <edumazet@google.com>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> > [bwh: Backported to 3.2: adjust context]
> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> > ---
> > net/core/dst.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > --- a/net/core/dst.c
> > +++ b/net/core/dst.c
> > @@ -269,10 +269,11 @@ void dst_release(struct dst_entry *dst)
> > {
> > if (dst) {
> > int newrefcnt;
> > + unsigned short nocache = dst->flags & DST_NOCACHE;
>
> Only one minor thing. Before 3.6 dst->flags was an int.
I noticed that - but no flags outside the 16-bit range are assigned, so
I think this is OK.
Ben.
> Thanks,
> Francesco
>
> >
> > newrefcnt = atomic_dec_return(&dst->__refcnt);
> > WARN_ON(newrefcnt < 0);
> > - if (!newrefcnt && unlikely(dst->flags & DST_NOCACHE)) {
> > + if (!newrefcnt && unlikely(nocache)) {
> > dst = dst_destroy(dst);
> > if (dst)
> > __dst_free(dst);
> >
--
Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web