github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-27 07:46:53 +00:00
Code Issues Projects Releases Wiki Activity

dm: virtio-net: replace banned functions

Browse Source 
sscanf and strcpy are banned according to the security requirements.
So replace them with their safe alternative.

Tracked-on: #1496
Signed-off-by: Jie Deng <jie.deng@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Jie Deng 2018-10-23 18:32:44 +08:00 committed by Xie, Nanlin
parent 7579678dd6
commit 7195537a6b
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
devicemodel/hw/pci/virtio/virtio_net.c
View File

@ -46,6 +46,7 @@
#include "mevent.h" #include "mevent.h"
#include "virtio.h" #include "virtio.h"
#include "vhost.h" #include "vhost.h"
#include "dm_string.h"
#define VIRTIO_NET_RINGSZ 1024 #define VIRTIO_NET_RINGSZ 1024
#define VIRTIO_NET_MAXSEGS 256 #define VIRTIO_NET_MAXSEGS 256
@ -200,18 +201,31 @@ static struct virtio_ops virtio_net_ops = {
static struct ether_addr * static struct ether_addr *
ether_aton(const char *a, struct ether_addr *e) ether_aton(const char *a, struct ether_addr *e)
{ {
int i;
unsigned int o0, o1, o2, o3, o4, o5; unsigned int o0, o1, o2, o3, o4, o5;
char *cp;
i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); if(!dm_strtoui(a, &cp, 16, &o0) &&
if (i != 6) *cp == ':' &&
!dm_strtoui(cp + 1, &cp, 16, &o1) &&
*cp == ':' &&
!dm_strtoui(cp + 1, &cp, 16, &o2) &&
*cp == ':' &&
!dm_strtoui(cp + 1, &cp, 16, &o3) &&
*cp == ':' &&
!dm_strtoui(cp + 1, &cp, 16, &o4) &&
*cp == ':' &&
!dm_strtoui(cp + 1, &cp, 16, &o5)) {
e->ether_addr_octet[0] = o0;
e->ether_addr_octet[1] = o1;
e->ether_addr_octet[2] = o2;
e->ether_addr_octet[3] = o3;
e->ether_addr_octet[4] = o4;
e->ether_addr_octet[5] = o5;
}
else {
return NULL; return NULL;
e->ether_addr_octet[0] = o0; }
e->ether_addr_octet[1] = o1;
e->ether_addr_octet[2] = o2;
e->ether_addr_octet[3] = o3;
e->ether_addr_octet[4] = o4;
e->ether_addr_octet[5] = o5;
return e; return e;
} }
@ -646,16 +660,12 @@ static void
virtio_net_tap_setup(struct virtio_net *net, char *devname) virtio_net_tap_setup(struct virtio_net *net, char *devname)
{ {
char tbuf[80 + 5]; /* room for "acrn_" prefix */ char tbuf[80 + 5]; /* room for "acrn_" prefix */
char *tbuf_ptr;
int vhost_fd = -1; int vhost_fd = -1;
int rc;
tbuf_ptr = tbuf; rc = snprintf(tbuf, strnlen(devname, 79) + 6, "acrn_%s", devname);
if (rc < 0 || rc >= 85) /* give warning if error or truncation happens */
strcpy(tbuf, "acrn_"); WPRINTF(("Fail to set tap device name %s\n", tbuf));
tbuf_ptr += 5;
strncat(tbuf_ptr, devname, sizeof(tbuf) - 6);
net->virtio_net_rx = virtio_net_tap_rx; net->virtio_net_rx = virtio_net_tap_rx;
net->virtio_net_tx = virtio_net_tap_tx; net->virtio_net_tx = virtio_net_tap_tx;