diff options
| author | archie <archie@FreeBSD.org> | 1998-12-04 22:54:57 +0000 |
|---|---|---|
| committer | archie <archie@FreeBSD.org> | 1998-12-04 22:54:57 +0000 |
| commit | 982e80577dd08945aa2345ebe35e3f50eef9eb48 (patch) | |
| tree | e21ff4cbfbcb4097c6cc444d68ddd9a3fd37837f /sys/dev/en | |
| parent | 707b8f68aa118c7396f2a2633751e32477d9ed08 (diff) | |
| download | FreeBSD-src-982e80577dd08945aa2345ebe35e3f50eef9eb48.zip FreeBSD-src-982e80577dd08945aa2345ebe35e3f50eef9eb48.tar.gz | |
Examine all occurrences of sprintf(), strcat(), and str[n]cpy()
for possible buffer overflow problems. Replaced most sprintf()'s
with snprintf(); for others cases, added terminating NUL bytes where
appropriate, replaced constants like "16" with sizeof(), etc.
These changes include several bug fixes, but most changes are for
maintainability's sake. Any instance where it wasn't "immediately
obvious" that a buffer overflow could not occur was made safer.
Reviewed by: Bruce Evans <bde@zeta.org.au>
Reviewed by: Matthew Dillon <dillon@apollo.backplane.com>
Reviewed by: Mike Spengler <mks@networkcs.com>
Diffstat (limited to 'sys/dev/en')
| -rw-r--r-- | sys/dev/en/if_en_pci.c | 2 | ||||
| -rw-r--r-- | sys/dev/en/midway.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c index d1853b5..37db78e 100644 --- a/sys/dev/en/if_en_pci.c +++ b/sys/dev/en/if_en_pci.c @@ -259,7 +259,7 @@ int unit; enpcis[unit] = scp; /* lock it in */ en_cd.cd_devs[unit] = sc; /* fake a cfdriver structure */ en_cd.cd_ndevs = NEN; - sprintf(sc->sc_dev.dv_xname, "en%d", unit); + snprintf(sc->sc_dev.dv_xname, sizeof(sc->sc_dev.dv_xname), "en%d", unit); sc->enif.if_unit = unit; sc->enif.if_name = "en"; diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c index 2e22fd1..44a4659 100644 --- a/sys/dev/en/midway.c +++ b/sys/dev/en/midway.c @@ -1278,8 +1278,8 @@ caddr_t data; break; if ((shadow = pvc_attach(ifp)) != NULL) { - sprintf(ifr->ifr_name, "%s%d", - shadow->if_name, shadow->if_unit); + snprintf(ifr->ifr_name, sizeof(ifr->ifr_name), + "%s%d", shadow->if_name, shadow->if_unit); } else error = ENOBUFS; @@ -3643,8 +3643,8 @@ static int en_pvctx(sc, pvcreq) pvcreq->pvc_ifname); return (EINVAL); } - sprintf(pvcreq->pvc_ifname, "%s%d", - sc->enif.if_name, sc->enif.if_unit); + snprintf(pvcreq->pvc_ifname, sizeof(pvcreq->pvc_ifname), + "%s%d", sc->enif.if_name, sc->enif.if_unit); ATM_PH_FLAGS(&api.aph) = ATM_PH_PVCSIF | (ATM_PH_FLAGS(pvc_aph) & (ATM_PH_AAL5|ATM_PH_LLCSNAP)); |
