diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2016-06-03 15:13:28 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2016-06-03 15:15:10 +0000 |
| commit | 781923f7213ae37c483b874a4ddf91c6df4c3ba0 (patch) | |
| tree | 43f0fb419fc0205bbff794b63857dcf3ad5a86e3 | |
| parent | 85140d8851b03565c7bbdce2fba94c6ca6664faf (diff) | |
| parent | a2f72b65ebc430aaf277ad797e554bb4deba9b95 (diff) | |
| download | illumos-joyent-781923f7213ae37c483b874a4ddf91c6df4c3ba0.tar.gz | |
[illumos-gate merge]
commit 0b8049bfb0e291160e960697b554596289d7f0bc
7034 negative record sizes should be rejected
commit a2f72b65ebc430aaf277ad797e554bb4deba9b95
7033 ustack helper should fault on bad return values
commit 771e39c3b1d6e2e0ba230442d782d83c60098296
7035 string-related subroutines should validate input earlier
Conflicts:
usr/src/uts/common/dtrace/dtrace.c
| -rw-r--r-- | usr/src/uts/common/dtrace/dtrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c index 9731c6f292..fc0206da29 100644 --- a/usr/src/uts/common/dtrace/dtrace.c +++ b/usr/src/uts/common/dtrace/dtrace.c @@ -389,7 +389,7 @@ do { \ if ((remp) != NULL) { \ *(remp) = (uintptr_t)(baseaddr) + (basesz) - (addr); \ } \ -} while (0) +_NOTE(CONSTCOND) } while (0) /* |