hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-21 08:24:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a couple of potential buffer overflows.

Browse Source 
Submitted by:	christer.oberg@texonet.com
This commit is contained in:
Hartmut Brandt 2004-02-21 16:29:10 +00:00
parent 588e78c575
commit 936d55b515
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=126069
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libatm/ioctl_subr.c
View File

@ -161,7 +161,7 @@ get_vcc_info(const char *intf, struct air_vcc_rsp **vccp)
air.air_opcode = AIOCS_INF_VCC;
bzero(air.air_vcc_intf, sizeof(air.air_vcc_intf));
if (intf != NULL && strlen(intf) != 0)
strcpy(air.air_vcc_intf, intf);
strncpy(air.air_vcc_intf, intf, IFNAMSIZ - 1);
buf_len = do_info_ioctl(&air, buf_len);
@ -375,7 +375,7 @@ get_cfg_info(const char *intf, struct air_cfg_rsp **cfgp)
air.air_opcode = AIOCS_INF_CFG;
bzero ( air.air_cfg_intf, sizeof(air.air_cfg_intf));
if ( intf != NULL && strlen(intf) != 0 )
strcpy ( air.air_cfg_intf, intf );
strncpy(air.air_cfg_intf, intf, IFNAMSIZ - 1);
buf_len = do_info_ioctl ( &air, buf_len );
@ -411,7 +411,7 @@ get_intf_info(const char *intf, struct air_int_rsp **intp)
air.air_opcode = AIOCS_INF_INT;
bzero ( air.air_int_intf, sizeof(air.air_int_intf));
if ( intf != NULL && strlen(intf) != 0 )
strcpy ( air.air_int_intf, intf );
strncpy(air.air_int_intf, intf, IFNAMSIZ - 1);
buf_len = do_info_ioctl ( &air, buf_len );
@ -448,7 +448,7 @@ get_netif_info(const char *intf, struct air_netif_rsp **netp)
air.air_opcode = AIOCS_INF_NIF;
bzero ( air.air_int_intf, sizeof(air.air_int_intf) );
if ( intf != NULL && strlen(intf) != 0 )
strcpy ( air.air_int_intf, intf );
strncpy(air.air_int_intf, intf, IFNAMSIZ - 1);
buf_len = do_info_ioctl ( &air, buf_len );

14
lib/libatm/ip_addr.c
View File

@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
#include <stdio.h>
#include <net/if.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@ -118,7 +119,7 @@ get_ip_addr(const char *p)
const char *
format_ip_addr(const struct in_addr *addr)
{
static char host_name[128];
static char host_name[MAXHOSTNAMELEN + 18];
char *ip_num;
struct hostent *ip_host;
@ -143,16 +144,13 @@ format_ip_addr(const struct in_addr *addr)
* Look up name in DNS
*/
ip_host = gethostbyaddr((const char *)addr, sizeof(addr), AF_INET);
if (ip_host && ip_host->h_name &&
strlen(ip_host->h_name)) {
if (ip_host && ip_host->h_name && strlen(ip_host->h_name)) {
/*
* Return host name followed by dotted decimal address
*/
strcpy(host_name, ip_host->h_name);
strcat(host_name, " (");
strcat(host_name, ip_num);
strcat(host_name, ")");
return(host_name);
snprintf(host_name, sizeof(host_name), "%s (%s)",
ip_host->h_name, ip_num);
return (host_name);
} else {
/*
* No host name -- just return dotted decimal address