ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix MAC address printing in dde_linux USB net drivers. 

Passing array of unsigned chars to Genode::log() function
makes it converted to void pointer, resulting in printing its address.

Wrapping this array into Genode::Cstring solves this problem
and makes it being printed properly as zero-terminaled string.

Signed-off-by: Oleg Girko <ol@infoserver.lv>

Fixes #3530
This commit is contained in:
Oleg Girko 2019-03-04 00:49:51 +00:00 committed by Christian Helmuth
parent b622a5a788
commit 4007cee852
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repos/dde_linux/src/drivers/usb/nic/nic.cc
View File

@ -666,7 +666,7 @@ struct sk_buff *skb_dequeue(struct sk_buff_head *list)
** linux/inerrupt.h **
**********************/
static void snprint_mac(u8 *buf, u8 *mac)
static void snprint_mac(char *buf, u8 *mac)
{
for (int i = 0; i < ETH_ALEN; i++)
{
@ -698,7 +698,7 @@ void eth_random_addr(u8 *addr)
void random_ether_addr(u8 *addr)
{
using namespace Genode;
u8 str[MAC_LEN + 1];
char str[MAC_LEN + 1];
u8 fallback[] = { 0x2e, 0x60, 0x90, 0x0c, 0x4e, 0x01 };
Nic::Mac_address mac;
@ -712,7 +712,7 @@ void random_ether_addr(u8 *addr)
} catch (...) {
/* use fallback mac */
snprint_mac(str, fallback);
Genode::warning("No mac address or wrong format attribute in <nic> - using fallback (", str, ")");
Genode::warning("No mac address or wrong format attribute in <nic> - using fallback (", Genode::Cstring(str), ")");
Genode::memcpy(addr, fallback, ETH_ALEN);
return;
@ -721,7 +721,7 @@ void random_ether_addr(u8 *addr)
/* use configured mac*/
Genode::memcpy(addr, mac.addr, ETH_ALEN);
snprint_mac(str, (u8 *)mac.addr);
Genode::log("Using configured mac: ", str);
Genode::log("Using configured mac: ", Genode::Cstring(str));
#ifdef GENODE_NET_STAT
_stat.set_mac(mac.addr);

8
repos/dde_linux/src/drivers/usb_net/lx_emul.cc
View File

@ -275,7 +275,7 @@ u32 get_unaligned_le32(const void *p)
enum { MAC_LEN = 17 };
static void snprint_mac(u8 *buf, u8 *mac)
static void snprint_mac(char *buf, u8 *mac)
{
for (int i = 0; i < ETH_ALEN; i++) {
Genode::snprintf((char *)&buf[i * 3], 3, "%02x", mac[i]);
@ -291,7 +291,7 @@ static void random_ether_addr(u8 *addr)
{
using namespace Genode;
u8 str[MAC_LEN + 1];
char str[MAC_LEN + 1];
u8 fallback[] = { 0x2e, 0x60, 0x90, 0x0c, 0x4e, 0x01 };
Nic::Mac_address mac;
@ -304,7 +304,7 @@ static void random_ether_addr(u8 *addr)
} catch (...) {
/* use fallback mac */
snprint_mac(str, fallback);
Genode::warning("No mac address or wrong format attribute in <nic> - using fallback (", str, ")");
Genode::warning("No mac address or wrong format attribute in <nic> - using fallback (", Genode::Cstring(str), ")");
Genode::memcpy(addr, fallback, ETH_ALEN);
return;
@ -313,7 +313,7 @@ static void random_ether_addr(u8 *addr)
/* use configured mac*/
Genode::memcpy(addr, mac.addr, ETH_ALEN);
snprint_mac(str, (u8 *)mac.addr);
Genode::log("Using configured mac: ", str);
Genode::log("Using configured mac: ", Genode::Cstring(str));
}