From patchwork Sat Jan 6 13:22:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 856364 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zDMhd6363z9s8J for ; Sun, 7 Jan 2018 00:24:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q/pX3Mk7"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zDMhd0ZV6zF0S7 for ; Sun, 7 Jan 2018 00:24:49 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q/pX3Mk7"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400d:c09::243; helo=mail-qk0-x243.google.com; envelope-from=festevam@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q/pX3Mk7"; dkim-atps=neutral Received: from mail-qk0-x243.google.com (mail-qk0-x243.google.com [IPv6:2607:f8b0:400d:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zDMf92FRtzDqJk for ; Sun, 7 Jan 2018 00:22:40 +1100 (AEDT) Received: by mail-qk0-x243.google.com with SMTP id m193so935644qke.1 for ; Sat, 06 Jan 2018 05:22:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZtYhVB3QdSOHMOAdsF+g0CzjLdgaBSYVpanvaiC81Cg=; b=Q/pX3Mk7ApzeK9bZyR2ai1E5PE3A1nGkBTz7SLdaqBkZ5yVAwVMIP/yRWLHzgEpFLq J0QTaQng/7N+OtBF9otdGYTv9LzX7/Saelu54jc+CeZRKKteGnPf99Cs3bxxwTVnO+sc X/ZTBMItd3GAh+VFuPhP0ZQeEt+YRejRXXDyqqopS2R1BQrE1kDvqpC6BNikT/JlCqAq KirmR5h3XXBxFe8ZCDwPWCNJmONHXOGEn0uucbJe7fzMTv7jt/BLXiqySauuQdY1ZPx4 Fn8WzXpkiI3Ni/8+HeVuaq9Z5lFV0fgtJsmevQVMaDMSONlvZpVVxz9UFTIhTDmQYE7f SaSA== 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=ZtYhVB3QdSOHMOAdsF+g0CzjLdgaBSYVpanvaiC81Cg=; b=LG2wqD+oOI50ST3BQnwCHHsL7pAeq3t3A1bQ+6eGY6rXNEMONHWAnbf5itu8gFj8j8 0XMrXLh1KNJwnRiitX1v5XF1KnyvGWsZoq/vznodB9l2RkM7gmWs64BKwmCF2rt5xjbz eYVzsiD8RJ32Zs5ovhiUpu6P2mkAFsJTQ2xw3ny3unFIk2jG2M3Z1PqOBhj9cFSEtrXW ANm/tsgxrOn5R4sEIwKyFzqEdDZXVbKBKouz7lnMPmoXUVlXwEiDItLAOEab9D4xXAWv 2tnedfpA450AhqmDhwO5RyIYniO4Mc9OOcsvxS21RmScHG7HsC2mTuS2pzKwOHkXvTKO t40Q== X-Gm-Message-State: AKGB3mJHLEC67sRCQQE7xDybW49KtA7S6bkCUDDu62qWmmiYu5dFCF49 ijkPEnfHVpbrY5oNNq6llm7Mhg== X-Google-Smtp-Source: ACJfBouUj15mhjs4FtRYD0WNQNmScTuFUdFgWpziAjgLYbssPr94oKI7GM1IBps15hrxcyk8Cai1zQ== X-Received: by 10.55.130.69 with SMTP id e66mr8852866qkd.76.1515244957064; Sat, 06 Jan 2018 05:22:37 -0800 (PST) Received: from localhost.localdomain ([187.180.183.27]) by smtp.gmail.com with ESMTPSA id q12sm4942636qtk.32.2018.01.06.05.22.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 Jan 2018 05:22:36 -0800 (PST) From: Fabio Estevam To: leoyang.li@nxp.com Subject: [PATCH] soc/fsl/guts: Add a NULL check for devm_kasprintf() Date: Sat, 6 Jan 2018 11:22:34 -0200 Message-Id: <1515244954-8374-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , linuxppc-dev@lists.ozlabs.org, yangbo.lu@nxp.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Fabio Estevam devm_kasprintf() may fail, so we should better add a NULL check and propagate an error on failure. Signed-off-by: Fabio Estevam Acked-by: Yangbo Lu --- drivers/soc/fsl/guts.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index d89a6a8..82251b4 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -167,10 +167,16 @@ static int fsl_guts_probe(struct platform_device *pdev) } else { soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ"); } + if (!soc_dev_attr.family) + return -ENOMEM; soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL, "svr:0x%08x", svr); + if (!soc_dev_attr.soc_id) + return -ENOMEM; soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d", (svr >> 4) & 0xf, svr & 0xf); + if (!soc_dev_attr.revision) + return -ENOMEM; soc_dev = soc_device_register(&soc_dev_attr); if (IS_ERR(soc_dev))