From patchwork Wed May 13 11:35:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Cormack X-Patchwork-Id: 471819 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AD413140663 for ; Wed, 13 May 2015 21:35:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754568AbbEMLff (ORCPT ); Wed, 13 May 2015 07:35:35 -0400 Received: from aibo.runbox.com ([91.220.196.211]:45844 "EHLO aibo.runbox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754067AbbEMLfe (ORCPT ); Wed, 13 May 2015 07:35:34 -0400 Received: from [10.9.9.206] (helo=mailfront02.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1YsUwl-0005IU-VV; Wed, 13 May 2015 13:35:32 +0200 Received: from 197.40.187.81.in-addr.arpa ([81.187.40.197] helo=brill) by mailfront02.runbox.com with esmtpsa (uid:818294 ) (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) id 1YsUwX-000723-I2; Wed, 13 May 2015 13:35:17 +0200 Message-ID: <1431516916.3278.8.camel@myriabit.com> Subject: [PATCH v5] macvtap add missing ioctls From: Justin Cormack To: David Miller Cc: netdev@vger.kernel.org Date: Wed, 13 May 2015 12:35:16 +0100 In-Reply-To: <20150512.230121.330638562727327262.davem@davemloft.net> References: <1431262215.3278.2.camel@myriabit.com> <20150511.134901.959375179450827063.davem@davemloft.net> <1431370810.3278.4.camel@myriabit.com> <20150512.230121.330638562727327262.davem@davemloft.net> X-Mailer: Evolution 3.12.11-0ubuntu3 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 8c350c5..d2a7783 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -1006,6 +1006,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd, unsigned int __user *up = argp; unsigned short u; int __user *sp = argp; + struct sockaddr sa; int s; int ret; @@ -1101,6 +1102,37 @@ 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: + if (copy_from_user(&sa, &ifr->ifr_hwaddr, sizeof(sa))) + return -EFAULT; + rtnl_lock(); + vlan = macvtap_get_vlan(q); + if (!vlan) { + rtnl_unlock(); + return -ENOLINK; + } + ret = dev_set_mac_address(vlan->dev, &sa); + macvtap_put_vlan(vlan); + rtnl_unlock(); + return ret; + default: return -EINVAL; }