github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

dm: fix the secure coding style violations

Browse Source 
There was some secure coding style violations of virtio net and tmp,
this patch add some NULL check to fix these violations.

Tracked-On: #6690
Signed-off-by: Chenli Wei <chenli.wei@linux.intel.com>
This commit is contained in:
Chenli Wei 2022-08-02 16:45:39 +08:00 committed by acrnsi-robot
parent 7d987f9b0f
commit 030b2f804c
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devicemodel/hw/mmio/core.c
View File

@ -115,11 +115,11 @@ int create_pt_acpidev(char *opt)
* *
* @pre (name != NULL) && (strlen(name) > 0) * @pre (name != NULL) && (strlen(name) > 0)
*/ */
int get_mmio_hpa_resource(char *name, uint64_t *res_start, uint64_t *res_size) bool get_mmio_hpa_resource(char *name, uint64_t *res_start, uint64_t *res_size)
{ {
FILE *fp; FILE *fp;
uint64_t start, end; uint64_t start, end;
int found = false; bool found = false;
char line[128]; char line[128];
char *cp; char *cp;

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

@ -850,14 +850,14 @@ virtio_net_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
unsigned char digest[16]; unsigned char digest[16];
char nstr[80]; char nstr[80];
char tname[MAXCOMLEN + 1]; char tname[MAXCOMLEN + 1];
struct virtio_net *net; struct virtio_net *net = NULL;
char *devopts = NULL; char *devopts = NULL;
char *name = NULL; char *name = NULL;
char *type = NULL; char *type = NULL;
char *mac_seed = NULL; char *mac_seed = NULL;
char *tmp; char *tmp = NULL;
char *vtopts; char *vtopts = NULL;
char *opt; char *opt = NULL;
int mac_provided; int mac_provided;
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
int rc; int rc;
@ -940,8 +940,11 @@ virtio_net_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
return -1; return -1;
} }
vtopts = tmp = strdup(opts); if (opts != NULL) {
if (strncmp(tmp, "tap", 3) == 0) { vtopts = tmp = strdup(opts);
}
if ((tmp != NULL) && (strncmp(tmp, "tap", 3) == 0)) {
type = strsep(&tmp, "="); type = strsep(&tmp, "=");
name = strsep(&tmp, ","); name = strsep(&tmp, ",");
} }
@ -963,8 +966,13 @@ virtio_net_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
* followed by an MD5 of the PCI slot/func number and dev name * followed by an MD5 of the PCI slot/func number and dev name
*/ */
if (!mac_provided) { if (!mac_provided) {
snprintf(nstr, sizeof(nstr), "%d-%d-%s", dev->slot, if (mac_seed != NULL) {
dev->func, mac_seed); snprintf(nstr, sizeof(nstr), "%d-%d-%s", dev->slot,
dev->func, mac_seed);
} else {
snprintf(nstr, sizeof(nstr), "%d-%d", dev->slot,
dev->func);
}
#if OPENSSL_VERSION_NUMBER >= 0x30000000L #if OPENSSL_VERSION_NUMBER >= 0x30000000L
EVP_MD_CTX *mdctx = EVP_MD_CTX_new(); EVP_MD_CTX *mdctx = EVP_MD_CTX_new();
EVP_DigestInit_ex(mdctx, EVP_md5(), NULL); EVP_DigestInit_ex(mdctx, EVP_md5(), NULL);

5
devicemodel/hw/platform/tpm/tpm.c
View File

@ -108,7 +108,7 @@ static int init_tpm2_pt(char *opts, struct mmio_dev *tpm2dev)
uint64_t tpm2_buffer_hpa, tpm2_buffer_size; uint64_t tpm2_buffer_hpa, tpm2_buffer_size;
uint32_t base = 0; uint32_t base = 0;
struct acpi_table_tpm2 tpm2 = { 0 }; struct acpi_table_tpm2 tpm2 = { 0 };
char *devopts, *vtopts; char *devopts, *vtopts = NULL;
/* TODO: Currently we did not validate if the opts is a valid one. /* TODO: Currently we did not validate if the opts is a valid one.
* We trust it to be valid as specifying --acpidev_pt is regarded * We trust it to be valid as specifying --acpidev_pt is regarded
@ -119,6 +119,9 @@ static int init_tpm2_pt(char *opts, struct mmio_dev *tpm2dev)
} }
devopts = strdup(opts); devopts = strdup(opts);
if (devopts == NULL) {
return -EINVAL;
}
vtopts = strstr(devopts,","); vtopts = strstr(devopts,",");
/* Check whether user set the uid to identify same hid devices for /* Check whether user set the uid to identify same hid devices for

2
devicemodel/include/mmio_dev.h
View File

@ -27,7 +27,7 @@ struct acpi_dev_pt_ops {
#define DEFINE_ACPI_PT_DEV(x) DATA_SET(acpi_dev_pt_ops_set, x); #define DEFINE_ACPI_PT_DEV(x) DATA_SET(acpi_dev_pt_ops_set, x);
struct mmio_dev *get_mmiodev(char *name); struct mmio_dev *get_mmiodev(char *name);
int get_mmio_hpa_resource(char *name, uint64_t *res_start, uint64_t *res_size); bool get_mmio_hpa_resource(char *name, uint64_t *res_start, uint64_t *res_size);
int get_more_acpi_dev_info(char *hid, uint32_t instance, struct acpi_dev_pt_ops *ops); int get_more_acpi_dev_info(char *hid, uint32_t instance, struct acpi_dev_pt_ops *ops);
void acpi_dev_write_dsdt(struct vmctx *ctx); void acpi_dev_write_dsdt(struct vmctx *ctx);