jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #126 from dhammika/125-null-term-ifr_name 

Null-term ioctl ifr_name strings #125
This commit is contained in:
Victor Marmol 2014-07-24 09:13:17 -07:00
parent 6777537b30 c391368000
commit 081a08e8a6
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netlink/netlink_linux.go
View File

@ -849,6 +849,10 @@ func getIfSocket() (fd int, err error) {
} }
func NetworkChangeName(iface *net.Interface, newName string) error { func NetworkChangeName(iface *net.Interface, newName string) error {
if len(newName) >= IFNAMSIZ {
return fmt.Errorf("Interface name %s too long", newName)
}
fd, err := getIfSocket() fd, err := getIfSocket()
if err != nil { if err != nil {
return err return err
@ -901,6 +905,10 @@ func NetworkCreateVethPair(name1, name2 string) error {
// Create the actual bridge device. This is more backward-compatible than // Create the actual bridge device. This is more backward-compatible than
// netlink.NetworkLinkAdd and works on RHEL 6. // netlink.NetworkLinkAdd and works on RHEL 6.
func CreateBridge(name string, setMacAddr bool) error { func CreateBridge(name string, setMacAddr bool) error {
if len(name) >= IFNAMSIZ {
return fmt.Errorf("Interface name %s too long", name)
}
s, err := getIfSocket() s, err := getIfSocket()
if err != nil { if err != nil {
return err return err
@ -950,6 +958,10 @@ func DeleteBridge(name string) error {
// Add a slave to abridge device. This is more backward-compatible than // Add a slave to abridge device. This is more backward-compatible than
// netlink.NetworkSetMaster and works on RHEL 6. // netlink.NetworkSetMaster and works on RHEL 6.
func AddToBridge(iface, master *net.Interface) error { func AddToBridge(iface, master *net.Interface) error {
if len(master.Name) >= IFNAMSIZ {
return fmt.Errorf("Interface name %s too long", master.Name)
}
s, err := getIfSocket() s, err := getIfSocket()
if err != nil { if err != nil {
return err return err
@ -957,7 +969,7 @@ func AddToBridge(iface, master *net.Interface) error {
defer syscall.Close(s) defer syscall.Close(s)
ifr := ifreqIndex{} ifr := ifreqIndex{}
copy(ifr.IfrnName[:], master.Name) copy(ifr.IfrnName[:len(ifr.IfrnName)-1], master.Name)
ifr.IfruIndex = int32(iface.Index) ifr.IfruIndex = int32(iface.Index)
if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(s), SIOC_BRADDIF, uintptr(unsafe.Pointer(&ifr))); err != 0 { if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(s), SIOC_BRADDIF, uintptr(unsafe.Pointer(&ifr))); err != 0 {
@ -968,9 +980,13 @@ func AddToBridge(iface, master *net.Interface) error {
} }
func setBridgeMacAddress(s int, name string) error { func setBridgeMacAddress(s int, name string) error {
if len(name) >= IFNAMSIZ {
return fmt.Errorf("Interface name %s too long", name)
}
ifr := ifreqHwaddr{} ifr := ifreqHwaddr{}
ifr.IfruHwaddr.Family = syscall.ARPHRD_ETHER ifr.IfruHwaddr.Family = syscall.ARPHRD_ETHER
copy(ifr.IfrnName[:], name) copy(ifr.IfrnName[:len(ifr.IfrnName)-1], name)
for i := 0; i < 6; i++ { for i := 0; i < 6; i++ {
ifr.IfruHwaddr.Data[i] = randIfrDataByte() ifr.IfruHwaddr.Data[i] = randIfrDataByte()