appcat
/
xfce4-speed-plugin
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Fix type for media_list on OpenBSD 

The `SIOCGIFMEDIA` ioctl was changed in OpenBSD to take a `uint64_t` for
`ifm_ulist` in [this OpenBSD commit][1].  The current code results in a
buffer overflow.

Resolves #16

[1]: f2a0e42315
master
Theo Buehler 2020-07-17 10:55:49 +02:00
parent 40e6dc11d9
commit 6192f5b356
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panel-plugin/wormulon/if_media.c
View File

@ -36,7 +36,11 @@ int get_if_speed (char *ifstring)
int speed=ERR_IFACE_NO_SPEED; int speed=ERR_IFACE_NO_SPEED;
int s; /* socket */ int s; /* socket */
struct ifmediareq ifmr; struct ifmediareq ifmr;
#if defined(__OpenBSD__)
uint64_t *media_list;
#else
int *media_list; int *media_list;
#endif
int type, physical; int type, physical;
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == NULL) if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == NULL)
@ -60,7 +64,7 @@ int get_if_speed (char *ifstring)
return ERR_IFACE_NO_SPEED; return ERR_IFACE_NO_SPEED;
} }
media_list = (int *)malloc(ifmr.ifm_count * sizeof(int)); media_list = malloc(ifmr.ifm_count * sizeof(*media_list));
if (media_list == NULL) if (media_list == NULL)
fprintf(stderr, "malloc() error in if_media.c\n"); fprintf(stderr, "malloc() error in if_media.c\n");
ifmr.ifm_ulist = media_list; ifmr.ifm_ulist = media_list;