From patchwork Tue Feb 4 20:43:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Capella X-Patchwork-Id: 3579251 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CBDB39F2F5 for ; Tue, 4 Feb 2014 20:44:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0418D2018E for ; Tue, 4 Feb 2014 20:44:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 296A82016C for ; Tue, 4 Feb 2014 20:44:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932646AbaBDUn7 (ORCPT ); Tue, 4 Feb 2014 15:43:59 -0500 Received: from mail-pb0-f47.google.com ([209.85.160.47]:35592 "EHLO mail-pb0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932641AbaBDUn4 (ORCPT ); Tue, 4 Feb 2014 15:43:56 -0500 Received: by mail-pb0-f47.google.com with SMTP id rp16so8904948pbb.6 for ; Tue, 04 Feb 2014 12:43:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Q8htu7gucHuTA5b8+wZjIaa9XLTfueaWN083sR7d1zs=; b=KczoE0dteTpWYlPp8C9LQw2j8jmYF/FUJQABoJ5f7ZPLkvxUIjmZc2Ybx0YIADB4MB StHKxk2LgpRcGF/qFmrikHR7CnPbCk75oLqk5UaiBHons1VpxGypTTLYD+eitUL3ZzMr CShKEwG68w9p69Xgl4MpI4MP3vI0m2HF6ESRlmgAXwHyFvtMROQFySQ7IKjP0ewHDyHI 8vDkjoGJhuzxEF37FVCZSCuB27FmRTS4CL8XznK8CaQfY+gggO+EG+DmbggR/Oxg6VLf AqicCknI5gKAt1Fp19Slmuj5Z3am8pnY04gLHGZyaecL5tbWW1kdVlbgnHgsdon78alQ RY9Q== X-Gm-Message-State: ALoCoQkpzC6bp/eWNL07HnP36FBQkS3JPCUqPSmzo1hsfzOgjP/sm2DBsyRR22jwrQc3Ege1ovHc X-Received: by 10.66.231.104 with SMTP id tf8mr8466755pac.48.1391546635611; Tue, 04 Feb 2014 12:43:55 -0800 (PST) Received: from localhost (cpe-76-93-135-111.san.res.rr.com. [76.93.135.111]) by mx.google.com with ESMTPSA id y7sm36604826pbb.8.2014.02.04.12.43.52 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Feb 2014 12:43:54 -0800 (PST) From: Sebastian Capella To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, patches@linaro.org Cc: Sebastian Capella , Andrew Morton , Michel Lespinasse , Shaohua Li , Jerome Marchand , Mikulas Patocka , Joonsoo Kim , Joe Perches , David Rientjes , Alexey Dobriyan Subject: [PATCH v7 1/3] mm: add kstrdup_trimnl function Date: Tue, 4 Feb 2014 12:43:49 -0800 Message-Id: <1391546631-7715-2-git-send-email-sebastian.capella@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391546631-7715-1-git-send-email-sebastian.capella@linaro.org> References: <1391546631-7715-1-git-send-email-sebastian.capella@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kstrdup_trimnl creates a duplicate of the passed in null-terminated string. If a trailing newline is found, it is removed before duplicating. This is useful for strings coming from sysfs that often include trailing whitespace due to user input. Signed-off-by: Sebastian Capella Cc: Andrew Morton Cc: Rik van Riel (commit_signer:5/10=50%) Cc: Michel Lespinasse Cc: Shaohua Li Cc: Jerome Marchand Cc: Mikulas Patocka Cc: Joonsoo Kim Cc: Joe Perches Cc: David Rientjes Cc: Alexey Dobriyan --- include/linux/string.h | 1 + mm/util.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/linux/string.h b/include/linux/string.h index ac889c5..e7ec8c0 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -114,6 +114,7 @@ void *memchr_inv(const void *s, int c, size_t n); extern char *kstrdup(const char *s, gfp_t gfp); extern char *kstrndup(const char *s, size_t len, gfp_t gfp); +extern char *kstrdup_trimnl(const char *s, gfp_t gfp); extern void *kmemdup(const void *src, size_t len, gfp_t gfp); extern char **argv_split(gfp_t gfp, const char *str, int *argcp); diff --git a/mm/util.c b/mm/util.c index 808f375..0bab867 100644 --- a/mm/util.c +++ b/mm/util.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -63,6 +64,34 @@ char *kstrndup(const char *s, size_t max, gfp_t gfp) EXPORT_SYMBOL(kstrndup); /** + * kstrdup_trimnl - Copy a %NUL terminated string, removing one trailing + * newline if present. + * @s: the string to duplicate + * @gfp: the GFP mask used in the kmalloc() call when allocating memory + * + * Returns an address, which the caller must kfree, containing + * a duplicate of the passed string with a single trailing newline + * removed if present. + */ +char *kstrdup_trimnl(const char *s, gfp_t gfp) +{ + char *buf; + size_t len = strlen(s); + if (len >= 1 && s[len - 1] == '\n') + len--; + + buf = kmalloc_track_caller(len + 1, gfp); + if (!buf) + return NULL; + + memcpy(buf, s, len); + buf[len] = '\0'; + + return buf; +} +EXPORT_SYMBOL(kstrdup_trimnl); + +/** * kmemdup - duplicate region of memory * * @src: memory region to duplicate