diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-01-29 13:26:42 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-01-29 13:26:42 +0000 |
| commit | 3740082b97b280af6385f17dadedf7455f075984 (patch) | |
| tree | 66e5e73f344a0dd7cba6f77c29ae002036cc2865 | |
| parent | 155110a47d3ae2ad362d7257e902bbf72c01ccad (diff) | |
| parent | 1a3a6dee3c970f347783cae39e1f3536e3116a96 (diff) | |
| download | illumos-joyent-3740082b97b280af6385f17dadedf7455f075984.tar.gz | |
[illumos-gate merge]
commit 1a3a6dee3c970f347783cae39e1f3536e3116a96
6584 harmless off-by-one in blkdev
| -rw-r--r-- | usr/src/uts/common/io/blkdev/blkdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/io/blkdev/blkdev.c b/usr/src/uts/common/io/blkdev/blkdev.c index 71a296fc5e..a4b7f6adca 100644 --- a/usr/src/uts/common/io/blkdev/blkdev.c +++ b/usr/src/uts/common/io/blkdev/blkdev.c @@ -22,7 +22,7 @@ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. * Copyright 2012 Alexey Zaytsev <alexey.zaytsev@gmail.com> All rights reserved. - * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright 2016 Nexenta Systems, Inc. All rights reserved. */ #include <sys/types.h> @@ -420,7 +420,7 @@ bd_errstats_setstr(kstat_named_t *k, char *str, size_t len, char *alt) if (KSTAT_NAMED_STR_PTR(k) == NULL) { if (len > 0) { tmp = kmem_alloc(len + 1, KM_SLEEP); - (void) strlcpy(tmp, str, len); + (void) strlcpy(tmp, str, len + 1); } else { tmp = alt; } |