From patchwork Tue Jul 31 13:02:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 143183 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5305526ljj; Tue, 31 Jul 2018 06:02:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc2c09mGM5M4DXVsiMlVzAiunV2DKx/kd7zG925yN4sny+PWCQ5e3CNAgHhXlSc9HSDGAah X-Received: by 2002:a63:d704:: with SMTP id d4-v6mr20423554pgg.312.1533042149682; Tue, 31 Jul 2018 06:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533042149; cv=none; d=google.com; s=arc-20160816; b=mvRye5Nf3tVOIBz7ib0zPFYT70xfF0TSbeAQHS26YP1pyy7WpyXK7ua8m69L8whJjd cWbbfgauJt9fbBi4DrSNtzK/Dqfz84o5e7+p2FMWTmLvwTDUakD9lwE0IGWbKMUwVt2c l8dJ9U1vW+rFa3vSpV44CqwIcU5trGFceIta4R0YYzIPd5xe6ef4zdiq9ynVkY8WFVG8 F5+RTVL0eabt15W35i2DgxRNAPgfPRi5ivfn+VIcY4tQAOVEXpJ8Vt81P/idjU1oYv5H ANagQ9lGvhSCxhygye60JR1YNXzIlQ5RvRp6JjUbsw3p6jDE1V+mgR+GhvOJiOzl6Thk fx5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=KLVRiVka3xPJAFL9cc5hyTRA6PYA8JSGZz58zSHFrCw=; b=yMj6J9n7oO+3U1Gpkhuo22rdk390XfVWuroa4ymYTM8qxB6If2qCCzjyFczXh6y+kg vC01MlTA7zGAjA4BaOoGaBXJltFzAXTwvunqAQKEC+HyeAt1hB0rGA7YPYaBAH6+MHxm hObYiZJGS1vlJtGuxQonZOBGfqI7NSFL9RafIVbCnO15EKvz3UmJURyWT6F/yoIPEpWM eyFaMoD6t5Rjnus7PF7X0SHQYQiB1M3kIsYyDjYk/FQVMfUY4dzNDQGOEpa1rkQB9nmJ FspBsx9pocXmJ64y6ZsHGSBIxwqHqTbLUu4KHEgz/F7NKYrPkuH2nz4QAjyUmzgAPKxq BuAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dD2WK6ko; 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=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u35-v6si13052722pgl.237.2018.07.31.06.02.29; Tue, 31 Jul 2018 06:02:29 -0700 (PDT) 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=@linaro.org header.s=google header.b=dD2WK6ko; 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=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732024AbeGaOmm (ORCPT + 13 others); Tue, 31 Jul 2018 10:42:42 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33653 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731962AbeGaOmm (ORCPT ); Tue, 31 Jul 2018 10:42:42 -0400 Received: by mail-pg1-f194.google.com with SMTP id r5-v6so9055454pgv.0 for ; Tue, 31 Jul 2018 06:02:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=KLVRiVka3xPJAFL9cc5hyTRA6PYA8JSGZz58zSHFrCw=; b=dD2WK6koP4D9OwXP2oukEGZZ+al/i3FR1TPBLK4o1D0AmpH+0d2/YBAXSOxBZV8lB5 ji1ACciCHIafL2D7xpdFU/LyPozbTgQr25GRQs8z0nDiwwTwrXUwibAiW2429MPOOWdf UQxGBuiCyvD59xuzvc2D8WfxXB/egBocdjJ98= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KLVRiVka3xPJAFL9cc5hyTRA6PYA8JSGZz58zSHFrCw=; b=Vz8KN75u1hkWOv2/JGIRE15uBvlPjaiKiDmxNWcJapp38izfyDq6LQWzb5kk0Eqs2G CirrWR1ZrPnnoiSFW2cQN1i7gv+nJnrtFwodMm2DaR/lqS070gEx252FFDSSkIkaYQL+ 4a5aA9+b0cN1lNFRNcBDBitRGfZvTekX0SYyS/ow8yLDf+vfKF/6bKQqa1TPt9vUqeUV JjMrJEUSysYgTrAIKA4Ujf2gnX/cJuE616aeoWsMk1iRnWJtYom8tO9aALfzU3PUDxN3 If2Qxl+kcsyP2eYyuOnyZWfhqv9sTjJOCAVy+DkTt4tnHXRddwhagAtloPTqdK6GeS6Q TXhA== X-Gm-Message-State: AOUpUlEwb2YzndGO8l37yja23mTbmkN9kSqqubqxYiCFPVklT2oqJFtU mKkYkG2avytU2rPMcdIgqmiN1FuTBvQ= X-Received: by 2002:a65:40ca:: with SMTP id u10-v6mr19854690pgp.2.1533042147200; Tue, 31 Jul 2018 06:02:27 -0700 (PDT) Received: from localhost.localdomain ([106.51.18.123]) by smtp.gmail.com with ESMTPSA id f23-v6sm23048473pgl.5.2018.07.31.06.02.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Jul 2018 06:02:25 -0700 (PDT) From: Amit Pundir To: Greg KH , Stable Cc: Fabio Estevam , Boris Brezillon Subject: [PATCH for-4.14.y 1/5] mtd: nand: qcom: Add a NULL check for devm_kasprintf() Date: Tue, 31 Jul 2018 18:32:17 +0530 Message-Id: <1533042142-8681-1-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Fabio Estevam commit 069f05346d01e7298939f16533953cdf52370be3 upstream. devm_kasprintf() may fail, so we should better add a NULL check and propagate an error on failure. Signed-off-by: Fabio Estevam Signed-off-by: Boris Brezillon Signed-off-by: Amit Pundir --- Cherry-picked from lede tree https://git.lede-project.org/?p=source.git Please apply it on 4.9.y as well. Not applicable for 4.4.y and 3.18.y drivers/mtd/nand/qcom_nandc.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c index 3baddfc997d1..b49ca02b399d 100644 --- a/drivers/mtd/nand/qcom_nandc.c +++ b/drivers/mtd/nand/qcom_nandc.c @@ -2544,6 +2544,9 @@ static int qcom_nand_host_init(struct qcom_nand_controller *nandc, nand_set_flash_node(chip, dn); mtd->name = devm_kasprintf(dev, GFP_KERNEL, "qcom_nand.%d", host->cs); + if (!mtd->name) + return -ENOMEM; + mtd->owner = THIS_MODULE; mtd->dev.parent = dev;