From mboxrd@z Thu Jan 1 00:00:00 1970 From: Justin Cormack Subject: Re: [PATCH v3] macvtap add missing ioctls - fix wrapping Date: Sun, 10 May 2015 13:50:15 +0100 Message-ID: <1431262215.3278.2.camel@myriabit.com> References: <1430927775.669.2.camel@myriabit.com> <20150509.174017.6956415471104971.davem@davemloft.net> <1431249359.669.5.camel@myriabit.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit To: David Miller , netdev@vger.kernel.org Return-path: Received: from aibo.runbox.com ([91.220.196.211]:59749 "EHLO aibo.runbox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751122AbbEJMuh (ORCPT ); Sun, 10 May 2015 08:50:37 -0400 In-Reply-To: <1431249359.669.5.camel@myriabit.com> Sender: netdev-owner@vger.kernel.org List-ID: The macvtap driver tries to emulate all the ioctls supported by a normal tun/tap driver, however it was missing the generic SIOCGIFHWADDR and SIOCSIFHWADDR ioctls to get and set the mac address that are supported by tun/tap. This patch adds these. Signed-off-by: Justin Cormack diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 8c350c5..f37e8f9 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -1101,6 +1101,35 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd, rtnl_unlock(); return ret; + case SIOCGIFHWADDR: + rtnl_lock(); + vlan = macvtap_get_vlan(q); + if (!vlan) { + rtnl_unlock(); + return -ENOLINK; + } + ret = 0; + u = vlan->dev->type; + if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) || + copy_to_user(&ifr->ifr_hwaddr.sa_data, vlan->dev->dev_addr, ETH_ALEN) || + put_user(u, &ifr->ifr_hwaddr.sa_family)) + ret = -EFAULT; + macvtap_put_vlan(vlan); + rtnl_unlock(); + return ret; + + case SIOCSIFHWADDR: + rtnl_lock(); + vlan = macvtap_get_vlan(q); + if (!vlan) { + rtnl_unlock(); + return -ENOLINK; + } + ret = dev_set_mac_address(vlan->dev, &ifr->ifr_hwaddr); + macvtap_put_vlan(vlan); + rtnl_unlock(); + return ret; + default: return -EINVAL; }