Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp249508ybi; Wed, 29 May 2019 20:37:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqyc1IZ6IcH3EoUE7xGSXl9e6d4rfSt3Uf5O4rwNKrq4YmSh+mAagXDTmBHKpqU+P+n3oeLr X-Received: by 2002:a17:90a:ad8b:: with SMTP id s11mr1685760pjq.48.1559187476318; Wed, 29 May 2019 20:37:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559187476; cv=none; d=google.com; s=arc-20160816; b=M1V4gfEcdN77XNstIl/GglI9XOUCKH5hshbxZMwu8aDqdeeR1VoVUGxm7dkcCaiXse nHfAzTJW7/yB8+ZE2gMldu8jdkTfaVM7GXc7pGcsyVoV8ib9O/vy06OIGpVcZu8eUAdC cv5fOiCWLMXBequslS4njhjy0XyUViYCRrP9NG4dJ00e5AvLdmEbuHQY0HW24H9WQ2Bl TyexMAm91EVl+D1mpCjfY4Rs65rHEa6Jvc0i8baFlV0wQDK9m5hdeoFnY2wADR8/B+Ek j+RdhuQDCCQzEkkyX1evPWKPNVTPCtXnJdxrfSmV+IG9qWCd4oBTk172BX7n4h8tg6Kl Q7Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+tYeqvoCEdVyPmTPWASnkhv8c9vocgz++VGCINw67Ps=; b=0x4W0HgmfIKZFuvhsfjIVatYEsWBpVUlAxzLoJYSanvEOE0nzHC8jmLzycWAsdKGUD Y5GIukInPqrUJMiuEEq/XQ911lr0QnJcX9KfVyDTxY67dIzFbLRkxxfpdUB8CV3uMzel NsBKrgMcrFIzfS33yxKJpvFCKwdj+QlJOzuOnUeM9+dHJwJQSCJzsLJ4V+YpiufrxUGf 6GQMmzcl70HFe6u1y7OF3KCS3IChA+5QEmBz7Ke5SsG7wlxg920x774NMw2nXlT0z5+a yTOiSNNhmNYjBcEs3u9eihVbRhTm9XRL09QU9s10CHrbdycftsiqdttjk402mqD44zZE SjEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QV6ytdw1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 68si1761050ple.89.2019.05.29.20.37.40; Wed, 29 May 2019 20:37:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=QV6ytdw1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732803AbfE3DZD (ORCPT + 99 others); Wed, 29 May 2019 23:25:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:50778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730556AbfE3DSU (ORCPT ); Wed, 29 May 2019 23:18:20 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1247E24787; Thu, 30 May 2019 03:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186299; bh=R/jHQoHhzUBZoo0xB8dbxQm1qlSAWS2p063ehpSGLWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QV6ytdw150VcR4N0QqVeT1T88aZaAdJ00uAvMjv/loKDKPD0NrA71TozeoYQG+YP5 xxC4VCdrUri5FhEh2QHXKuiDtm9daP02+u4UHeAORSdGD9pBojyUPOtshT1btkcRe+ 9lTq2BgZbbEeTE8iUAmeJTzufvS4MTHjnyhutBjo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Nick Desaulniers , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 262/276] media: saa7146: avoid high stack usage with clang Date: Wed, 29 May 2019 20:07:00 -0700 Message-Id: <20190530030541.589347419@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 03aa4f191a36f33fce015387f84efa0eee94408e ] Two saa7146/hexium files contain a construct that causes a warning when built with clang: drivers/media/pci/saa7146/hexium_orion.c:210:12: error: stack frame size of 2272 bytes in function 'hexium_probe' [-Werror,-Wframe-larger-than=] static int hexium_probe(struct saa7146_dev *dev) ^ drivers/media/pci/saa7146/hexium_gemini.c:257:12: error: stack frame size of 2304 bytes in function 'hexium_attach' [-Werror,-Wframe-larger-than=] static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info) ^ This one happens regardless of KASAN, and the problem is that a constructor to initialize a dynamically allocated structure leads to a copy of that structure on the stack, whereas gcc initializes it in place. Link: https://bugs.llvm.org/show_bug.cgi?id=40776 Signed-off-by: Arnd Bergmann Reviewed-by: Nick Desaulniers Signed-off-by: Hans Verkuil [hverkuil-cisco@xs4all.nl: fix checkpatch warnings] Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/saa7146/hexium_gemini.c | 5 ++--- drivers/media/pci/saa7146/hexium_orion.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/media/pci/saa7146/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c index 5817d9cde4d0c..6d8e4afe9673a 100644 --- a/drivers/media/pci/saa7146/hexium_gemini.c +++ b/drivers/media/pci/saa7146/hexium_gemini.c @@ -270,9 +270,8 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d /* enable i2c-port pins */ saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); - hexium->i2c_adapter = (struct i2c_adapter) { - .name = "hexium gemini", - }; + strscpy(hexium->i2c_adapter.name, "hexium gemini", + sizeof(hexium->i2c_adapter.name)); saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); if (i2c_add_adapter(&hexium->i2c_adapter) < 0) { DEB_S("cannot register i2c-device. skipping.\n"); diff --git a/drivers/media/pci/saa7146/hexium_orion.c b/drivers/media/pci/saa7146/hexium_orion.c index 0a05176c18ab6..a794f9e5f9908 100644 --- a/drivers/media/pci/saa7146/hexium_orion.c +++ b/drivers/media/pci/saa7146/hexium_orion.c @@ -231,9 +231,8 @@ static int hexium_probe(struct saa7146_dev *dev) saa7146_write(dev, DD1_STREAM_B, 0x00000000); saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); - hexium->i2c_adapter = (struct i2c_adapter) { - .name = "hexium orion", - }; + strscpy(hexium->i2c_adapter.name, "hexium orion", + sizeof(hexium->i2c_adapter.name)); saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); if (i2c_add_adapter(&hexium->i2c_adapter) < 0) { DEB_S("cannot register i2c-device. skipping.\n"); -- 2.20.1