summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/imgact_elf.c6
-rw-r--r--sys/kern/kern_shutdown.c4
-rw-r--r--sys/kern/kern_sysctl.c4
-rw-r--r--sys/kern/subr_autoconf.c4
-rw-r--r--sys/kern/subr_devstat.c3
-rw-r--r--sys/kern/subr_diskmbr.c4
-rw-r--r--sys/kern/subr_diskslice.c7
-rw-r--r--sys/kern/vfs_export.c4
-rw-r--r--sys/kern/vfs_subr.c4
9 files changed, 21 insertions, 19 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 0989b03..25b7031 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: imgact_elf.c,v 1.41 1998/10/18 15:55:12 peter Exp $
+ * $Id: imgact_elf.c,v 1.42 1998/10/25 17:44:50 phk Exp $
*/
#include "opt_rlimit.h"
@@ -548,8 +548,8 @@ exec_elf_imgact(struct image_params *imgp)
imgp->proc->p_sysent = brand_info->sysvec;
if (interp != NULL) {
- strcpy(path, brand_info->emul_path);
- strcat(path, interp);
+ snprintf(path, sizeof(path), "%s%s",
+ brand_info->emul_path, interp);
if ((error = elf_load_file(imgp->proc, path, &addr,
&imgp->entry_addr)) != 0) {
uprintf("ELF interpreter %s not found\n", path);
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index d2f7116..3a2c650 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.41 1998/10/30 05:41:15 msmith Exp $
+ * $Id: kern_shutdown.c,v 1.42 1998/11/13 22:40:37 msmith Exp $
*/
#include "opt_ddb.h"
@@ -427,7 +427,7 @@ panic(const char *fmt, ...)
panicstr = fmt;
va_start(ap, fmt);
- (void)vsprintf(buf, fmt, ap);
+ (void)vsnprintf(buf, sizeof(buf), fmt, ap);
if (panicstr == fmt)
panicstr = buf;
va_end(ap);
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index c3e221f..0d5f22e 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94
- * $Id: kern_sysctl.c,v 1.77 1998/09/05 17:13:27 bde Exp $
+ * $Id: kern_sysctl.c,v 1.78 1998/10/16 03:55:00 peter Exp $
*/
#include "opt_compat.h"
@@ -225,7 +225,7 @@ sysctl_sysctl_name SYSCTL_HANDLER_ARGS
while (namelen) {
if (!lsp) {
- sprintf(buf,"%d",*name);
+ snprintf(buf,sizeof(buf),"%d",*name);
if (req->oldidx)
error = SYSCTL_OUT(req, ".", 1);
if (!error)
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 2ab21f5..8dfba39 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -41,7 +41,7 @@
*
* @(#)subr_autoconf.c 8.1 (Berkeley) 6/10/93
*
- * $Id: subr_autoconf.c,v 1.5 1997/09/21 22:00:18 gibbs Exp $
+ * $Id: subr_autoconf.c,v 1.6 1997/11/18 12:43:41 bde Exp $
*/
#include <sys/param.h>
@@ -341,7 +341,7 @@ evcnt_attach(dev, name, ev)
/* ev->ev_next = NULL; */
ev->ev_dev = dev;
/* ev->ev_count = 0; */
- strcpy(ev->ev_name, name);
+ snprintf(ev->ev_name, sizeof(ev->ev_name), "%s", name);
*nextp = ev;
nextp = &ev->ev_next;
}
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index 5d8f4a8..8976c3b 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: subr_devstat.c,v 1.5 1998/11/14 21:58:51 wollman Exp $
+ * $Id: subr_devstat.c,v 1.6 1998/11/15 23:57:22 ken Exp $
*/
#include <sys/param.h>
@@ -73,6 +73,7 @@ devstat_add_entry(struct devstat *ds, const char *dev_name,
ds->device_number = devstat_current_devnumber++;
ds->unit_number = unit_number;
strncpy(ds->device_name, dev_name, DEVSTAT_NAME_LEN);
+ ds->device_name[DEVSTAT_NAME_LEN - 1] = 0;
ds->block_size = block_size;
ds->flags = flags;
ds->device_type = device_type;
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index ab9d4ba..adfd39c 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -35,7 +35,7 @@
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $Id: diskslice_machdep.c,v 1.30 1998/07/25 16:35:06 bde Exp $
+ * $Id: diskslice_machdep.c,v 1.31 1998/08/10 07:22:14 phk Exp $
*/
#include <sys/param.h>
@@ -405,7 +405,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset,
sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE,
RAW_PART, partname);
- strcpy(buf, sname);
+ snprintf(buf, sizeof(buf), "%s", sname);
if (strlen(buf) < sizeof buf - 11)
strcat(buf, "<extended>");
check_part(buf, dp, base_ext_offset, nsectors,
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 83590e6..8a4eef6 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $Id: subr_diskslice.c,v 1.58 1998/08/23 20:16:34 phk Exp $
+ * $Id: subr_diskslice.c,v 1.59 1998/10/17 09:46:42 bde Exp $
*/
#include "opt_devfs.h"
@@ -680,13 +680,14 @@ dsname(dname, unit, slice, part, partname)
if (strlen(dname) > 16)
dname = "nametoolong";
- sprintf(name, "%s%d", dname, unit);
+ snprintf(name, sizeof(name), "%s%d", dname, unit);
partname[0] = '\0';
if (slice != WHOLE_DISK_SLICE || part != RAW_PART) {
partname[0] = 'a' + part;
partname[1] = '\0';
if (slice != COMPATIBILITY_SLICE)
- sprintf(name + strlen(name), "s%d", slice - 1);
+ snprintf(name + strlen(name),
+ sizeof(name) - strlen(name), "s%d", slice - 1);
}
return (name);
}
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 971c005..6111120 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.172 1998/10/31 07:42:03 peter Exp $
+ * $Id: vfs_subr.c,v 1.173 1998/10/31 14:20:39 peter Exp $
*/
/*
@@ -1902,7 +1902,7 @@ vprint(label, vp)
char *label;
register struct vnode *vp;
{
- char buf[64];
+ char buf[96];
if (label != NULL)
printf("%s: %p: ", label, (void *)vp);
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 971c005..6111120 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.172 1998/10/31 07:42:03 peter Exp $
+ * $Id: vfs_subr.c,v 1.173 1998/10/31 14:20:39 peter Exp $
*/
/*
@@ -1902,7 +1902,7 @@ vprint(label, vp)
char *label;
register struct vnode *vp;
{
- char buf[64];
+ char buf[96];
if (label != NULL)
printf("%s: %p: ", label, (void *)vp);
OpenPOWER on IntegriCloud