Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1757346imm; Thu, 27 Sep 2018 01:54:55 -0700 (PDT) X-Google-Smtp-Source: ACcGV60XEGvGmlYf3Dv9nEO4kzrSHvX/rawc3ZdCqIFeSVxDcGuKg2b7Z7dB25u81dIbsLVqFyi2 X-Received: by 2002:a65:66c9:: with SMTP id c9-v6mr6021023pgw.55.1538038495353; Thu, 27 Sep 2018 01:54:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538038495; cv=none; d=google.com; s=arc-20160816; b=SsZkrLfwC8uznYlm1fOLe7tYJDF+pX8Iojr2CsOlwXLWPSpMxCbO5T0Ht01/vnuTiX HCPcyxbzJ7UM4OuE/87bOvqM02oS7LmddjevD78wsYUuuVkbbvX5PUdG6UiMtQ2dKKHj zIuv76SeNeh35UjZ0cdXrPjFFyFtlodDwftgGyOr/E3139QCKUQpPMjepz2S0FVCpAik +8v95I5fRilTxFArOStdIQqwwqtDTaagv7j8x4juZgMCvgGtWzl57KYdSzjK3fLg7IFe BvNNb0lBaqKvlYgfOJyvwojDHhAwUXhCdHb75e7aYEfViizwLcMUO1u8BBDo2SCVBHZD j6Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=LN82kBLMbUwOGlu9+EOQTrB7Wt/hDKp4rCdGDeOv1hU=; b=sv25AAUC++QdFBdu5Gb9ophlaMA2TTu4H7u2Q0IcAXSE3Byxr3O5N7vwy+Wf9za4j1 +Kn9V/BhFsrRv9aaOkfokJwtLJTiFS4iKcUVZPJDJuau03CW6tmbaZDl3xGkxZ61n+YR sUncEM1CxnCxbyJrNShBnmhUwCyhr1T9CLU5cZP2nQoPH7L3wFph5V18tjV72KEk+TAG jgHRC6k9Ft14Pn4zewUpy+uUwxmz+AKczpb9DfvF1G/OmYh2dkjK9rU9Jvlb8x8EX0VN 2HXX8rFx79u7cTp4AWtY61hL8M9tpBohfZNdzPuzIXPhcNtzy7bzrPvuAdeW9ouhnCqJ uDTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20150623.gappssmtp.com header.s=20150623 header.b=yNcrUJJH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p184-v6si1427542pga.536.2018.09.27.01.54.39; Thu, 27 Sep 2018 01:54:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20150623.gappssmtp.com header.s=20150623 header.b=yNcrUJJH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727169AbeI0PKc (ORCPT + 99 others); Thu, 27 Sep 2018 11:10:32 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:39010 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726953AbeI0PKb (ORCPT ); Thu, 27 Sep 2018 11:10:31 -0400 Received: by mail-it1-f195.google.com with SMTP id w200-v6so6668339itc.4 for ; Thu, 27 Sep 2018 01:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=LN82kBLMbUwOGlu9+EOQTrB7Wt/hDKp4rCdGDeOv1hU=; b=yNcrUJJHTaZ69VBCpoNwoiH7e9mHAURHrwy4i+D0moCXLsSJygObO49oOZodtqIt1G 37xQmjfSiO7uSJBuR+RwJLCfbmfFswUZuAfDKiKhNpt4S4iCxCN0IAFu2+8hw9vbo4hv WvctYUI3K1svuObW/1o84HURnZsjFYZ77DR7pYhGClNU3ZxKSvrQmIXMC+oOP0slmxYf RDrnsiSLv//JGlendXJBPh4o4GJ6DyUDodpo3LJD1HFwfdjCOR7GgWhlCIQfCurjeqp8 7BZz7/4i915fplPapGKBdz9uYcD4fuOpgo75En6pW/rXA0/JwmCtBdYlH1jwYeH+UOAf mr9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=LN82kBLMbUwOGlu9+EOQTrB7Wt/hDKp4rCdGDeOv1hU=; b=FZJPKIc7hiFHjrRmXHGlFCGfRX3s2jPZpHjWDPJKfHBR+67hNl54zbb95PV85PMcPp CG92Cw1rH0NITsgfY6XEFUvLciy+GQYzKOOBXaIUXkB3gm4Kg8njkeJuPFgUsPovRvTy GUpEz5EQIUTEmd7LYdpHwH5eY0gpzQAHyl/3JrrVosBlkT5SizQd1ABau5sJ4az//7lT VNDGoemAdVDL+AfxmbbdJQqD5lVRTRh1+jfrHR5VwEhMBQtCQivJ+5IFzFLCmFJlZwbK MlGKE0uILPVeK1GZiEpsR/4HtkkGPWRt4AVQDFun3VJRKSIERXC4Q98GF8n6YlITN0Wc hdTA== X-Gm-Message-State: ABuFfojKCWeYjemJDvxzKdAqajN3W320rVR8brmvqAqWT5b/LMM87/Vf RN7hd5F9axLqq/hBGbjbwId1WoWp/D29QTWbDu+W8g== X-Received: by 2002:a02:943:: with SMTP id f64-v6mr9038771jad.31.1538038400916; Thu, 27 Sep 2018 01:53:20 -0700 (PDT) MIME-Version: 1.0 References: <20180924101150.23349-1-brgl@bgdev.pl> <20180924101150.23349-4-brgl@bgdev.pl> In-Reply-To: From: Bartosz Golaszewski Date: Thu, 27 Sep 2018 10:53:09 +0200 Message-ID: Subject: Re: [PATCH v3 3/4] devres: provide devm_kstrdup_const() To: Kees Cook Cc: Michael Turquette , Stephen Boyd , Greg Kroah-Hartman , "Rafael J . Wysocki" , Arend van Spriel , Ulf Hansson , Bjorn Helgaas , Vivek Gautam , Robin Murphy , Joe Perches , Heikki Krogerus , Andrew Morton , Mike Rapoport , Michal Hocko , Al Viro , Jonathan Corbet , Roman Gushchin , Huang Ying , Bjorn Andersson , Arnd Bergmann , Andy Shevchenko , linux-clk , Linux Kernel Mailing List , linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org czw., 27 wrz 2018 o 01:20 Kees Cook napisa=C5=82(a)= : > > On Mon, Sep 24, 2018 at 3:11 AM, Bartosz Golaszewski wrot= e: > > Provide a resource managed version of kstrdup_const(). This variant > > internally calls devm_kstrdup() on pointers that are outside of > > .rodata section and returns the string as is otherwise. > > > > Also provide a corresponding version of devm_kfree(). > > > > Signed-off-by: Bartosz Golaszewski > > Reviewed-by: Bjorn Andersson > > --- > > drivers/base/devres.c | 38 ++++++++++++++++++++++++++++++++++++++ > > include/linux/device.h | 3 +++ > > 2 files changed, 41 insertions(+) > > > > diff --git a/drivers/base/devres.c b/drivers/base/devres.c > > index 438c91a43508..48185d57bc5b 100644 > > --- a/drivers/base/devres.c > > +++ b/drivers/base/devres.c > > @@ -11,6 +11,8 @@ > > #include > > #include > > > > +#include > > + > > #include "base.h" > > > > struct devres_node { > > @@ -822,6 +824,28 @@ char *devm_kstrdup(struct device *dev, const char = *s, gfp_t gfp) > > } > > EXPORT_SYMBOL_GPL(devm_kstrdup); > > > > +/** > > + * devm_kstrdup_const - resource managed conditional string duplicatio= n > > + * @dev: device for which to duplicate the string > > + * @s: the string to duplicate > > + * @gfp: the GFP mask used in the kmalloc() call when allocating memor= y > > + * > > + * Strings allocated by devm_kstrdup_const will be automatically freed= when > > + * the associated device is detached. > > + * > > + * RETURNS: > > + * Source string if it is in .rodata section otherwise it falls back t= o > > + * devm_kstrdup. > > + */ > > +const char *devm_kstrdup_const(struct device *dev, const char *s, gfp_= t gfp) > > +{ > > + if (is_kernel_rodata((unsigned long)s)) > > + return s; > > + > > + return devm_kstrdup(dev, s, gfp); > > +} > > +EXPORT_SYMBOL(devm_kstrdup_const); > > + > > /** > > * devm_kvasprintf - Allocate resource managed space and format a stri= ng > > * into that. > > @@ -895,6 +919,20 @@ void devm_kfree(struct device *dev, const void *p) > > } > > EXPORT_SYMBOL_GPL(devm_kfree); > > > > +/** > > + * devm_kfree_const - Resource managed conditional kfree > > + * @dev: device this memory belongs to > > + * @p: memory to free > > + * > > + * Function calls devm_kfree only if @p is not in .rodata section. > > + */ > > +void devm_kfree_const(struct device *dev, const void *p) > > +{ > > + if (!is_kernel_rodata((unsigned long)p)) > > + devm_kfree(dev, p); > > +} > > +EXPORT_SYMBOL(devm_kfree_const); > > + > > /** > > * devm_kmemdup - Resource-managed kmemdup > > * @dev: Device this memory belongs to > > diff --git a/include/linux/device.h b/include/linux/device.h > > index 33f7cb271fbb..79ccc6eb0975 100644 > > --- a/include/linux/device.h > > +++ b/include/linux/device.h > > @@ -693,7 +693,10 @@ static inline void *devm_kcalloc(struct device *de= v, > > return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO); > > } > > extern void devm_kfree(struct device *dev, const void *p); > > +extern void devm_kfree_const(struct device *dev, const void *p); > > With devm_kfree and devm_kfree_const both taking "const", how are > devm_kstrdup_const() and devm_kfree_const() going to be correctly > paired at compile time? (i.e. I wasn't expecting the prototype change > to devm_kfree()) > I guess the same as with kfree() and kfree_const() which both take const void * as argument - it's up to users to only use devm_kfree_const() on resources allocated with devm_kstrdup_const(). Bart > -Kees > > > extern char *devm_kstrdup(struct device *dev, const char *s, gfp_t gfp= ) __malloc; > > +extern const char *devm_kstrdup_const(struct device *dev, > > + const char *s, gfp_t gfp); > > extern void *devm_kmemdup(struct device *dev, const void *src, size_t = len, > > gfp_t gfp); > > > > -- > > 2.18.0 > > > > > > -- > Kees Cook > Pixel Security