X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fsyscall_netadd-net.hc;h=e7e710520dbd3316717e283dc40c478629b68d08;hb=HEAD;hp=6238f41bb5e8ed93b2baa8f9baf234c1c01b1996;hpb=a6be71d3e49f0f633705ba5e4e08cc1cac811344;p=util-vserver.git diff --git a/lib/syscall_netadd-net.hc b/lib/syscall_netadd-net.hc index 6238f41..e7e7105 100644 --- a/lib/syscall_netadd-net.hc +++ b/lib/syscall_netadd-net.hc @@ -26,10 +26,17 @@ vc_net_add_net(nid_t nid, struct vc_net_addr const *info) struct vcmd_net_addr_v0 k_info; size_t i; - k_info.type = info->vna_type & (VC_NXA_TYPE_IPV4|VC_NXA_TYPE_IPV6); + k_info.type = info->vna_type & (VC_NXA_TYPE_IPV4|VC_NXA_TYPE_IPV6|VC_NXA_MOD_BCAST); k_info.count = 1; - switch (info->vna_type & ~VC_NXA_TYPE_ADDR) { + + if ((k_info.type | VC_NXA_TYPE_ADDR) != info->vna_type) { + errno = EINVAL; + return -1; + } + + switch (k_info.type) { case VC_NXA_TYPE_IPV4: + case VC_NXA_TYPE_IPV4 | VC_NXA_MOD_BCAST: k_info.ip[0].s_addr = info->vna_v4_ip.s_addr; k_info.mask[0].s_addr = info->vna_v4_mask.s_addr; break; @@ -38,9 +45,6 @@ vc_net_add_net(nid_t nid, struct vc_net_addr const *info) k_info.ip[i].s_addr = info->vna_v6_ip.s6_addr32[i]; k_info.mask[0].s_addr = info->vna_prefix; break; - default: - errno = EINVAL; - return -1; } return vserver(VCMD_net_add_v0, NID_USER2KERNEL(nid), &k_info);