From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vlad Yasevich Subject: Re: [PATCH v2] sctp: Change defaults on cookie hmac selection Date: Mon, 07 Jan 2013 10:32:01 -0500 Message-ID: <50EAEA71.1060007@gmail.com> References: <1355511060-27320-1-git-send-email-nhorman@tuxdriver.com> <1355534521-32719-1-git-send-email-nhorman@tuxdriver.com> <50EACCD3.90609@openwrt.org> <20130107144921.GA31577@hmsreliant.think-freely.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Florian Fainelli , netdev@vger.kernel.org, David Miller , Linus Torvalds , linux-sctp@vger.kernel.org To: Neil Horman Return-path: Received: from mail-oa0-f41.google.com ([209.85.219.41]:62332 "EHLO mail-oa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753169Ab3AGPcI (ORCPT ); Mon, 7 Jan 2013 10:32:08 -0500 In-Reply-To: <20130107144921.GA31577@hmsreliant.think-freely.org> Sender: netdev-owner@vger.kernel.org List-ID: On 01/07/2013 09:49 AM, Neil Horman wrote: > On Mon, Jan 07, 2013 at 02:25:39PM +0100, Florian Fainelli wrote: >> Hello Neil, >> >> Le 12/15/12 02:22, Neil Horman a =E9crit : >>> Recently I posted commit 3c68198e75 which made selection of the coo= kie hmac >>> algorithm selectable. This is all well and good, but Linus noted t= hat it >>> changes the default config: >>> http://marc.info/?l=3Dlinux-netdev&m=3D135536629004808&w=3D2 >>> >>> I've modified the sctp Kconfig file to reflect the recommended way = of making >>> this choice, using the thermal driver example specified, and brough= t the >>> defaults back into line with the way they were prior to my origiona= l patch >>> >>> Also, on Linus' suggestion, re-adding ability to select default 'no= ne' hmac >>> algorithm, so we don't needlessly bloat the kernel by forcing a non= -none >>> default. This also led me to note that we won't honor the default = none >>> condition properly because of how sctp_net_init is encoded. Fix th= at up as >>> well. >>> >>> Tested by myself (allbeit fairly quickly). All configuration combi= nations seems >>> to work soundly. >>> >>> Signed-off-by: Neil Horman >>> CC: David Miller >>> CC: Linus Torvalds >>> CC: Vlad Yasevich >>> CC: linux-sctp@vger.kernel.org >>> --- >>> net/sctp/Kconfig | 27 +++++++++++++++++++++++++-- >>> net/sctp/protocol.c | 4 ++-- >>> 2 files changed, 27 insertions(+), 4 deletions(-) >>> >>> diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig >>> index a9edd2e..c262106 100644 >>> --- a/net/sctp/Kconfig >>> +++ b/net/sctp/Kconfig >>> @@ -66,12 +66,36 @@ config SCTP_DBG_OBJCNT >>> 'cat /proc/net/sctp/sctp_dbg_objcnt' >>> >>> If unsure, say N >>> +choice >>> + prompt "Default SCTP cookie HMAC encoding" >>> + default SCTP_COOKIE_HMAC_MD5 >> >> Should not this be SCTP_DEFAULT_COOKIE_HMAC_MD5? I just tried to >> update to 3.8-rc2, and I usually build my kernel-headers with: >> >> yes '' | ARCH=3Dfoo make oldconfig >> >> and this just kept asking me for this config symbol because none >> could be provided. >> -- >> Florian >> > > No, the config mechanism is setup to offer the user the ability to ch= oose a > default cookie hmac, alg, then optionally select any other hmac algs = you would > like to be made available (in the event you want to change the defaul= t at run > time). When you select the default, it eables (via the select direct= ive), the > corresponding SCTP_COOKIE_HMAC_* config option, which is used in the = build, and > then prompts for the remaining values. > Neil Actually, I think it should be as Florian suggests. The default value=20 of the choice should be one of the values defined as part of the choice= =20 (the SCTP_DEFAULT_COOKIE_*). Turning on appropriate default would turn= =20 on appropriate cookie config (SCTP_COOKIE_HMAC_*). Would that save all the config trouble? -vlad > Neil >