From patchwork Tue Feb 19 03:22:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 10819145 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40AE017D5 for ; Tue, 19 Feb 2019 03:23:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 295E72BD84 for ; Tue, 19 Feb 2019 03:23:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19AC72BDA4; Tue, 19 Feb 2019 03:23:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 924212BD84 for ; Tue, 19 Feb 2019 03:23:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725771AbfBSDXB (ORCPT ); Mon, 18 Feb 2019 22:23:01 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:35647 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725770AbfBSDXA (ORCPT ); Mon, 18 Feb 2019 22:23:00 -0500 Received: by mail-ed1-f65.google.com with SMTP id g19so6515283edp.2; Mon, 18 Feb 2019 19:22:59 -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:mime-version :content-transfer-encoding; bh=jl8mehWyrUBP556vhgCSLwlVFDpTSFATt786X/rXFy0=; b=rppNowcTh7frIdWuG7SfdEhRYXnN6B9/ZLJWfNtcz1LccaZsL5AdjSi4ZvIwPULFqA cKBOymYVgebWq1i7mItu5bW/+nA/WNfQDLm4TgfJn2GDeenpXUp9GNJeMdBIAtzxr883 hIR/onWd9CNv9U/G+15GFYhUCius83IDD2YaKpDJB3/zkfnK3oc63gT8cI/EaFWoE1Ey vGB/SGTPeZAc7RlSUtXTLJolVJKvatap6LlSm5lSdQUe0hfz/EdRiVcChwmggdbzO8ew sKOJyontu5csWIzylrVJdfGq8GGbo//m334+qHuwtrl2tXGtZdJSUL2tGOYoNJ7kcyCv /cog== 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:mime-version :content-transfer-encoding; bh=jl8mehWyrUBP556vhgCSLwlVFDpTSFATt786X/rXFy0=; b=PHAiSrPD8//NBhLo0l1Lt0sg+qK/49gMFeH568R1/LHnehmBJ6pVE45AS30i6n1jLa WagrljRxaOqPK5goRpCHKtDF9Kx+eW2RiGYKpV2Judb6PmUnrJfksEFGnB6nntqfZruV QCJflPyTjNTS1c9qZReimLeutFYE2NioMvHNdqaJN+YMdTZlp+n3IqvLhoPw7WW+P2FZ pHWNH408a1MddJT+oBB+faZd+Vgh31BWS1QxQHxNS9/L23XSb34a5Fole4cQXCfF6her JAA5V5FlG8NvCP02nTDwbZepQjrfhrIk18VNuSLMnmQJvHtOTN52nqNrM6T2BeCG5nQJ VqWQ== X-Gm-Message-State: AHQUAuZChVzJRTUnmikmy4imDvJpaxxZXNl21kRzniJROyMmPBpV7+dX aQWH4XaX7ApsXBsvXWNhoGI= X-Google-Smtp-Source: AHgI3Ib8DAK2epvilWIwyDk/cQcbtCyMyjAo8X7djRfiF/LivxlJuQv04wI3dLeDDobLcFrK7YHPOA== X-Received: by 2002:a17:906:1d0d:: with SMTP id n13mr11051396ejh.23.1550546578588; Mon, 18 Feb 2019 19:22:58 -0800 (PST) Received: from localhost.localdomain ([2a01:4f9:2a:1fae::2]) by smtp.gmail.com with ESMTPSA id b9sm4649069ede.12.2019.02.18.19.22.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 19:22:57 -0800 (PST) From: Nathan Chancellor To: Sumit Garg , Jens Wiklander Cc: Matt Mackall , Herbert Xu , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Nick Desaulniers , Daniel Thompson , Nathan Chancellor Subject: [PATCH] hwrng: optee: Initialize some structs using memset instead of braces Date: Mon, 18 Feb 2019 20:22:40 -0700 Message-Id: <20190219032240.22935-1-natechancellor@gmail.com> X-Mailer: git-send-email 2.21.0.rc1 MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clang warns: drivers/char/hw_random/optee-rng.c:80:31: warning: suggest braces around initialization of subobject [-Wmissing-braces] struct tee_param param[4] = {0}; ^ {} drivers/char/hw_random/optee-rng.c:177:31: warning: suggest braces around initialization of subobject [-Wmissing-braces] struct tee_param param[4] = {0}; ^ {} drivers/char/hw_random/optee-rng.c:212:48: warning: suggest braces around initialization of subobject [-Wmissing-braces] struct tee_ioctl_open_session_arg sess_arg = {0}; ^ {} 3 warnings generated. One way to fix these warnings is to add additional braces like Clang suggests; however, there has been a bit of push back from some maintainers, who just prefer memset as it is unambiguous, doesn't depend on a particular compiler version, and properly initializes all subobjects [1][2]. Do that here so there are no more warnings. [1]: https://lore.kernel.org/lkml/022e41c0-8465-dc7a-a45c-64187ecd9684@amd.com/ [2]: https://lore.kernel.org/lkml/20181128.215241.702406654469517539.davem@davemloft.net/ Fixes: 5fe8b1cc6a03 ("hwrng: add OP-TEE based rng driver") Link: https://github.com/ClangBuiltLinux/linux/issues/369 Signed-off-by: Nathan Chancellor Reviewed-by: Sumit Garg --- drivers/char/hw_random/optee-rng.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/char/hw_random/optee-rng.c b/drivers/char/hw_random/optee-rng.c index 2b9fc8ac5500..46f4bcd28c41 100644 --- a/drivers/char/hw_random/optee-rng.c +++ b/drivers/char/hw_random/optee-rng.c @@ -76,8 +76,11 @@ static size_t get_optee_rng_data(struct optee_rng_private *pvt_data, u32 ret = 0; u8 *rng_data = NULL; size_t rng_size = 0; - struct tee_ioctl_invoke_arg inv_arg = {0}; - struct tee_param param[4] = {0}; + struct tee_ioctl_invoke_arg inv_arg; + struct tee_param param[4]; + + memset(&inv_arg, 0, sizeof(inv_arg)); + memset(¶m, 0, sizeof(param)); /* Invoke TA_CMD_GET_ENTROPY function of Trusted App */ inv_arg.func = TA_CMD_GET_ENTROPY; @@ -173,8 +176,11 @@ static struct optee_rng_private pvt_data = { static int get_optee_rng_info(struct device *dev) { u32 ret = 0; - struct tee_ioctl_invoke_arg inv_arg = {0}; - struct tee_param param[4] = {0}; + struct tee_ioctl_invoke_arg inv_arg; + struct tee_param param[4]; + + memset(&inv_arg, 0, sizeof(inv_arg)); + memset(¶m, 0, sizeof(param)); /* Invoke TA_CMD_GET_RNG_INFO function of Trusted App */ inv_arg.func = TA_CMD_GET_RNG_INFO; @@ -209,7 +215,9 @@ static int optee_rng_probe(struct device *dev) { struct tee_client_device *rng_device = to_tee_client_device(dev); int ret = 0, err = -ENODEV; - struct tee_ioctl_open_session_arg sess_arg = {0}; + struct tee_ioctl_open_session_arg sess_arg; + + memset(&sess_arg, 0, sizeof(sess_arg)); /* Open context with TEE driver */ pvt_data.ctx = tee_client_open_context(NULL, optee_ctx_match, NULL,