diff options
| author | Bryan Cantrill <bryan@joyent.com> | 2015-05-14 07:40:18 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2015-05-18 17:21:27 -0700 |
| commit | d47448f09aae3aa1a87fc450a0c44638e7ce7b51 (patch) | |
| tree | d609759726c0ce4a8f99068cccd86e263c372c83 /usr/src/uts/common/dtrace/dtrace.c | |
| parent | 8412fdadc46d5bd0355a53fda7bda83e60803108 (diff) | |
| download | illumos-joyent-d47448f09aae3aa1a87fc450a0c44638e7ce7b51.tar.gz | |
3599 dtrace_dynvar tail calls can blow stack
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/common/dtrace/dtrace.c')
| -rw-r--r-- | usr/src/uts/common/dtrace/dtrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c index 0d2d6f524c..aa4b1d67e0 100644 --- a/usr/src/uts/common/dtrace/dtrace.c +++ b/usr/src/uts/common/dtrace/dtrace.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2015, Joyent, Inc. All rights reserved. * Copyright (c) 2012, 2014 by Delphix. All rights reserved. */ @@ -2037,7 +2037,7 @@ retry: * this hash chain, or another CPU is deleting an element from this * hash chain. The simplest way to deal with both of these cases * (though not necessarily the most efficient) is to free our - * allocated block and tail-call ourselves. Note that the free is + * allocated block and re-attempt it all. Note that the free is * to the dirty list and _not_ to the free list. This is to prevent * races with allocators, above. */ @@ -2050,7 +2050,7 @@ retry: dvar->dtdv_next = free; } while (dtrace_casptr(&dcpu->dtdsc_dirty, free, dvar) != free); - return (dtrace_dynvar(dstate, nkeys, key, dsize, op, mstate, vstate)); + goto top; } /*ARGSUSED*/ |