From patchwork Thu Jan 18 20:59:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125026 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp293830lja; Thu, 18 Jan 2018 12:59:54 -0800 (PST) X-Google-Smtp-Source: ACJfBov8HIOC9r7Rfh2kAT0RcM6ORYJzNXn/i3D+KO8F0ywtXbMlc/idU+ydKABqmZRstVv0w11D X-Received: by 10.99.125.78 with SMTP id m14mr2603612pgn.383.1516309194376; Thu, 18 Jan 2018 12:59:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309194; cv=none; d=google.com; s=arc-20160816; b=P1btMrs7WtPHeYtmqvFkEdt10j/0yWMaR8Cu2zRH7//4okaNtjfYLU4PuG4ZrovAt3 BCPntJ+/i4kVQnjroUns9JOVEMom41wvVVAWoP1616QI88kFxKgLTIw6tRnP1eulqnXJ gZjkNxQjXHFco/A6l1GJ7AGF0tjs5OVtV3kitfRMYQxNAc3CA776Kx0c4OoUgTmWE8zY Ke1SnPdnYwijsmwA/i5PztBoe31m7m2CLCHuAlxs3DDo+Gb5P4WO6rCTnINdb+kNdPZe nFepNIaGtwMhv/YBZ5nu+1G1mr8HoVFoMDOHaOu4HxDyfWA99VS+nL1hOKNBKwc/fBek j7lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=BN7E0HUgQMnKxnMghGWkEwQNGpQaeINwHb57lwS69k4=; b=c9cTsXtr0LM+5uzaOBQgrStkdeR8fwU/I7P6AtJKLgkRH+2xQfxljhWAwlHa+ofzX4 SUrqhvSBK4S9bykkZh+ui3vUKBZ9lzibUf3Q2i1hmgGMH5dPrg3ubq8+wNHrvl9Ttm8/ 3Rd8x9nxSsXXTU4j1UnSLuHxVTmnFCfcIDAg8ySG6FLcO9GQF/cb71oW34yUhH+UxP78 FcV4HExzJbYg2bOa6vmkwEO7gTOp2eCX7IQdog8lpF7NrA9K25dedkSo4UgXdSwsybCo IKyx0vEdwysyCSz9lWEs/UZ0xHcS2PuqWy4QqHMGIAkVMu5DXyD6svHipe7E5gly9j0j 82MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=j9VvfHDH; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16si4933770pgu.706.2018.01.18.12.59.54; Thu, 18 Jan 2018 12:59:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@microsoft.com header.s=selector1 header.b=j9VvfHDH; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753718AbeARU7x (ORCPT + 10 others); Thu, 18 Jan 2018 15:59:53 -0500 Received: from mail-by2nam01on0120.outbound.protection.outlook.com ([104.47.34.120]:44880 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932368AbeARU7p (ORCPT ); Thu, 18 Jan 2018 15:59:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=BN7E0HUgQMnKxnMghGWkEwQNGpQaeINwHb57lwS69k4=; b=j9VvfHDHj8HOpIBLc9FrvSv8ubwpan/XQIKPE25I/c+n7aknDl0TKKjl5Ih0A7U+Rhiiid39qIq4ZVny8hcz1wMzA8meiufgGF396EsBow7Hyi6I2ORUYxxNtOQIkLBoWbluLZqtXuVGICuLWFoelVMauU+doI0WTo31+KlEA3M= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1064.namprd21.prod.outlook.com (52.132.130.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.444.7; Thu, 18 Jan 2018 20:59:40 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 20:59:40 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Brian Norris , Sasha Levin Subject: [added to the 4.1 stable tree] mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy Thread-Topic: [added to the 4.1 stable tree] mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy Thread-Index: AQHTkJ8/CN4fJ5fdbk6k+RPwdU4vNQ== Date: Thu, 18 Jan 2018 20:59:37 +0000 Message-ID: <20180118205908.3220-26-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.98.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1064; 6:g5eJ1AOimrvsTYwC0OTER/kW9ZQ9SFvax9A0NaGE6rpHr2DRTtneKEMgHFQ/uIMJyqA0TFu3mntVYMu0pCKws0OFbUtQbxt1wrlnbKxzAZm0p/+/we5qud7dATIiuBy+8QvsL0LNwc8ERuBVlK8yIB7YgkR2EWOaAXIj3kxg+zp4cMKWascPXbJnI6lKz6a51hetay+2innRogdlmXHep28pXVUT5ELMlw1JIcuj3tmg3iEBBeO8CtvdGjooh8Rkq8nh2PJb6FZxUOU4x72eBu+2Ou8PSqCTp7ttvfr5DAoHyIrsFkiS5LhTCmZDmc1Yaxoiuhq7en0OyY2OIO8KDJn+UHcWkv3UM5c095cBbFnKR/2EyFpYM8nTBzU0AFfZ; 5:Wv4QKUIWR9iySiyNRPDvxo6rVgRugNkpANow3JK6tze2CSZoMTW8RjZmZTdYHV5qBI9d+VW3OQgyUn/CVotc0/jZSQ40Qyk9pNW1a2s+S8a9DLhlyA2KWqt4v/ahtyX/hIHqjNnjUZkSruubOVUZHJrzpQQUzG9BNgEwTQXR93M=; 24:SIAhOTAmvo7O86dmpQbx1seNtp/x77UrmU3nMKXxG53YsSwttylXqa+joTWH2i6AasfHgW4lrqSfuXX1jaXGCa5ov81eG4D4nleU42QTJ/g=; 7:WeljjcYyNpw60mrIbN82i+RSobT3XeyfL68lTsRWhEZxpX3jZmoZ4Rz07kXThlmQcM3Fd8wR/jJsAbKLao1Uh4ATPSM/gFVKSQSCmH09p6no6ovOhmJwEKcMJwg5vl9RQuiQ5yFsVBG+QHesPAB18nradntj/VZRvisA5X5tv8qLkV6o7iHdJ//Cb9lhS9GjJjD1KHZrFlHdKQ3+RFA6qViASZnti8lxAFRI8iAsrgEmCtCWsL4suGvsZhkyDFbW x-ms-office365-filtering-correlation-id: ff41d5e9-672c-4532-e684-08d55eb66434 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB1064; x-ms-traffictypediagnostic: DM5PR2101MB1064: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(20558992708506)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(5005006)(8121501046)(3231046)(2400067)(944501161)(3002001)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041282)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB1064; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB1064; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(346002)(396003)(39860400002)(366004)(376002)(199004)(189003)(106356001)(25786009)(68736007)(107886003)(2900100001)(39060400002)(26005)(105586002)(102836004)(8676002)(4326008)(6506007)(14454004)(59450400001)(76176011)(86612001)(81156014)(10090500001)(8936002)(86362001)(72206003)(81166006)(5250100002)(6346003)(2501003)(478600001)(10290500003)(99286004)(2950100002)(305945005)(53936002)(2906002)(6666003)(5660300001)(3846002)(1076002)(66066001)(6116002)(22452003)(316002)(6512007)(110136005)(54906003)(3280700002)(6436002)(3660700001)(97736004)(36756003)(7736002)(6486002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1064; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: nNeGkSI8oo30VFJgEvPQl5sQy7Vxezb566nuWHdo/7+u/794uGGW5BDRArSbbvOW/sHj7xGUmUEwQAx1fTUIag== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff41d5e9-672c-4532-e684-08d55eb66434 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 20:59:37.0572 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1064 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit 906b268477bc03daaa04f739844c120fe4dbc991 ] kernelci.org reports a warning for this driver, as it copies a local variable into a 'const char *' string: drivers/mtd/maps/pmcmsp-flash.c:149:30: warning: passing argument 1 of 'strncpy' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] Using kstrndup() simplifies the code and avoids the warning. Signed-off-by: Arnd Bergmann Acked-by: Marek Vasut Signed-off-by: Brian Norris Signed-off-by: Sasha Levin --- drivers/mtd/maps/pmcmsp-flash.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c index 744ca5cacc9b..cf54420f943d 100644 --- a/drivers/mtd/maps/pmcmsp-flash.c +++ b/drivers/mtd/maps/pmcmsp-flash.c @@ -139,15 +139,13 @@ static int __init init_msp_flash(void) } msp_maps[i].bankwidth = 1; - msp_maps[i].name = kmalloc(7, GFP_KERNEL); + msp_maps[i].name = kstrndup(flash_name, 7, GFP_KERNEL); if (!msp_maps[i].name) { iounmap(msp_maps[i].virt); kfree(msp_parts[i]); goto cleanup_loop; } - msp_maps[i].name = strncpy(msp_maps[i].name, flash_name, 7); - for (j = 0; j < pcnt; j++) { part_name[5] = '0' + i; part_name[7] = '0' + j;