Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965979AbbLQA1O (ORCPT ); Wed, 16 Dec 2015 19:27:14 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:33171 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754802AbbLQA1H (ORCPT ); Wed, 16 Dec 2015 19:27:07 -0500 MIME-Version: 1.0 In-Reply-To: <20151216.113814.2025166082777387327.davem@davemloft.net> References: <1450127046-4573-1-git-send-email-ddecotig@gmail.com> <1450127046-4573-6-git-send-email-ddecotig@gmail.com> <20151216.113814.2025166082777387327.davem@davemloft.net> From: David Decotigny Date: Wed, 16 Dec 2015 16:26:46 -0800 X-Google-Sender-Auth: GiWvHt8SvHElV3k6-nLouLPW5QY Message-ID: Subject: Re: [PATCH net-next v5 05/19] net: ethtool: add new ETHTOOL_GSETTINGS/SSETTINGS API To: David Miller Cc: Ben Hutchings , "linux-kernel@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-api@vger.kernel.org" , linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org, Andrew Morton , Tejun Heo , Eric Dumazet , Eugenia Emantayev , Or Gerlitz , Ido Shamay , Joe Perches , Saeed Mahameed , Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru , Jeff Kirsher , Pravin B Shelar , Ed Swierk , Robert Love , "James E.J. Bottomley" , Yuval Mintz , Rasmus Villemoes Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2805 Lines: 59 Thanks David: you are right, we should copy back sizeof(struct ethtool_settings) in that case and not sizeof(usettings). Sorry about that, will fix for v6. a few questions before sending update: - is this handshake reasonable? or should we have an ethtool cmd dedicated to this kind of handshake, or should we hardcode bitmap length once and for all (ie. 128 instead of 32 today)? - is it ok to have the u32[] api part of bitmap.h? I was assuming it could be used for other ioctl/syscalls outside ethtool... but maybe this is being too pretentious and we could keep this internal to net/core? - struct inheritance is used to have the link mode bitmaps piggybacked at end the public struct ethtool_settings. hence this "parent" field. I'm not super proud of this, but I find relying on the compiler more comfortable. could revise my position with a constructor+accessors macros if you think it's preferred. On Wed, Dec 16, 2015 at 8:38 AM, David Miller wrote: > From: David Decotigny > Date: Mon, 14 Dec 2015 13:03:52 -0800 > >> +static int ethtool_get_ksettings(struct net_device *dev, void __user *useraddr) >> +{ > ... >> + if (__ETHTOOL_LINK_MODE_MASK_NU32 >> + != ksettings.parent.link_mode_masks_nwords) { >> + /* wrong link mode nbits requested */ >> + memset(&ksettings, 0, sizeof(ksettings)); >> + /* keep cmd field reset to 0 */ >> + /* send back number of words required as negative val */ >> + compiletime_assert(__ETHTOOL_LINK_MODE_MASK_NU32 <= S8_MAX, >> + "need too many bits for link modes!"); >> + ksettings.parent.link_mode_masks_nwords >> + = -((s8)__ETHTOOL_LINK_MODE_MASK_NU32); > > I'm trying to understand how this can work. > > Supposedly, the link_mode_masks_nwords field is there so that we can > add new link modes yet still work with tools built against any > particular link mode list in the UAPI header files. > > But here you're forcing the value of link_mode_masks_nwords and then > copying that amount back to userspace. If the user allocated less > space than the the link mode list in the kernel supports, we will > overwrite past the end of the user's usettings object. > > You cannot unconditionally copy sizeof(usettings) back to the user, > as store_ksettings_for_user() will do. > > I think you have to truncate here, copying only the array elements the > user's structure actually has space for. That's the only way this can > work. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/