Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-lib-ip: fix creating address instances from integers

Browse source 
Ensure that the proper byte order is used when creating IPv4/IPv6/MAC
instances from integer values on big endian systems.

Fixes: #6678
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2023-11-07 22:59:08 +01:00
parent 3508984fd7
commit ac7b37ef01
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libs/luci-lib-ip/src/ip.c
View file

@ -406,28 +406,28 @@ static int _cidr_new(lua_State *L, int index, int family, bool mask)
if (lua_type(L, index) == LUA_TNUMBER) if (lua_type(L, index) == LUA_TNUMBER)
{ {
n = htonl(lua_tointeger(L, index)); n = lua_tointeger(L, index);
if (family == AF_INET6) if (family == AF_INET6)
{ {
cidr.family = AF_INET6; cidr.family = AF_INET6;
cidr.addr.v6.s6_addr[12] = n; cidr.addr.v6.s6_addr[12] = n / 0x1000000;
cidr.addr.v6.s6_addr[13] = (n >> 8); cidr.addr.v6.s6_addr[13] = n % 0x1000000 / 0x10000;
cidr.addr.v6.s6_addr[14] = (n >> 16); cidr.addr.v6.s6_addr[14] = n % 0x10000 / 0x100;
cidr.addr.v6.s6_addr[15] = (n >> 24); cidr.addr.v6.s6_addr[15] = n % 0x100;
} }
else if (family == AF_INET) else if (family == AF_INET)
{ {
cidr.family = AF_INET; cidr.family = AF_INET;
cidr.addr.v4.s_addr = n; cidr.addr.v4.s_addr = htonl(n);
} }
else else
{ {
cidr.family = AF_PACKET; cidr.family = AF_PACKET;
cidr.addr.mac.ether_addr_octet[2] = n; cidr.addr.mac.ether_addr_octet[2] = n / 0x1000000;
cidr.addr.mac.ether_addr_octet[3] = (n >> 8); cidr.addr.mac.ether_addr_octet[3] = n % 0x1000000 / 0x10000;
cidr.addr.mac.ether_addr_octet[4] = (n >> 16); cidr.addr.mac.ether_addr_octet[4] = n % 0x10000 / 0x100;
cidr.addr.mac.ether_addr_octet[5] = (n >> 24); cidr.addr.mac.ether_addr_octet[5] = n % 0x100;
} }
cidr.bits = AF_BITS(cidr.family); cidr.bits = AF_BITS(cidr.family);