From patchwork Thu Mar 1 15:26:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130261 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2949519edc; Thu, 1 Mar 2018 07:36:08 -0800 (PST) X-Google-Smtp-Source: AG47ELtQlNeyzGYT/IdlIsXdL3uGVVsd5qQwiDea009g9mSbr55N7AHLQKUyHtTUKBK+Be29gDJ6 X-Received: by 10.98.102.155 with SMTP id s27mr2373004pfj.198.1519918568509; Thu, 01 Mar 2018 07:36:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918568; cv=none; d=google.com; s=arc-20160816; b=DSBF4inx1G4TlF5PUpKVZS82faNFbHssZcqCcYcHnAqDXyoIMdQIY6i1+VN/Ut8Xm2 PK71VrIf7q0PV57lHk+7imYoPH6B2+mzTcTBxLmgCJw599ix5OdexX3JjHKZgSYr6+IF xCngAEzLYRjToyO1MJB5DgT1S2U9T6y2rRpX5jDXy9wxs3TSqeWeq2J1P/6HT34Df9Hs lF678Nhv6CrgEuglxWeyeQ1oMKY1zm1vxG4A2XGBh3rUVa/gasYp4VoTjxSDxurP+s/X BmcT9leUM/ETpG7NAObPwM+t+Uc5jefiMMXN9cb4WeFXp78PvC5OFld+g8MWIWNsxdD4 gF1Q== 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=W1b3Ef8vEGuC+BhqjWzhS5S1fSCXFLFwG49xzGcRoG8=; b=gYcmzXxwwvESjwn69bqhhPwy/CjW3uYP0NrujvnzcfI0i0/HCEZXogKV4iDvkIqYOY D7lXZXkfb+/oRw12KPVRIO+aqPRQFSz4qWAIga5DGblxeyEjCBJDMxDs1wAFRf3TFd3i vy09vaJjgxdmwXY56Iq9AH0xq+toeAAiZWhFLs7u3o1NHgHyRRYqwIZovBD1gUXIzahu DVPG+BFdE9z0XgDOmDTmLbLe0XbyibjsDmnIUVJU7XYWxY1G/2WJbZLJ/PxqVgOEjFkf IcpK/vmxD0/APXI1zgHjZ0C3cllHylmMDOF/DMrVGWAWm02PRtf7Yjsnqfx7PasifAnG w8Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=gEO/TeW5; 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 g4si3157102pfh.98.2018.03.01.07.36.08; Thu, 01 Mar 2018 07:36:08 -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=gEO/TeW5; 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 S1032470AbeCAPgF (ORCPT + 10 others); Thu, 1 Mar 2018 10:36:05 -0500 Received: from mail-cys01nam02on0114.outbound.protection.outlook.com ([104.47.37.114]:27244 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032471AbeCAPgC (ORCPT ); Thu, 1 Mar 2018 10:36:02 -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=W1b3Ef8vEGuC+BhqjWzhS5S1fSCXFLFwG49xzGcRoG8=; b=gEO/TeW5KlqtLaIaIMzyZwk6BRGRkNfE1nkYWktR/EtIkf1zrzQQmke/F2BQzY5XLZT4AVdEv66yNonnpliKg5PBz533QSoNhMub8Ggi+kkk0dQP8XfQ4D6Ff5qjHNQ7MIB9TjpI2adMprW4joYzSWoPBx1diy1HP8C2c4RgJJk= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0872.namprd21.prod.outlook.com (10.167.111.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:35:52 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:35:52 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Mauro Carvalho Chehab , Sasha Levin Subject: [added to the 4.1 stable tree] media: r820t: fix r820t_write_reg for KASAN Thread-Topic: [added to the 4.1 stable tree] media: r820t: fix r820t_write_reg for KASAN Thread-Index: AQHTsXGw4VEMV9swAUi/TgBo/xd7xg== Date: Thu, 1 Mar 2018 15:26:36 +0000 Message-ID: <20180301152116.1486-381-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0872; 6:zKoYa76mTV6QMGnNnJZSeKSLR6BWNFO5dMrt1XYqhIF6SYoXuLq5PnTsANcUFFlItb+O1awdvK1C3LzwVG0BQ3qqEiVMzYKURujE6bC7JZ9s72oXADA/Z+24vXFB5oG81rvgoB2BhT5GmRMOT/H+Vl+NC0ycbaJ26IoLZJl88YD0wDAxX4QN2pwtu+nIL9nZX44co85ryiB3YKlpoRZXGxqJYwnYFWOFlizpu25fqbiwooneVrURfPxeQujBgTRlaoeAUdPNW5myI/gFgSyflT6aCZLTeahqRgYvrY+3lNyYB3ytI+Pa2q/esPRmOEpDA1Nm4zxipuGYngaIzEENI9WmltTXpV39v/AlyFfFuL4urkVSOS6jzhFTEmVflUW7; 5:YT6fYB+IO8zXhOIhDU9OefVgq3jgPP4JkYtx6tu9Mw8PxY9JUiUM/zVgGcyvu9IoK4LB1pjS8lLzOfBv4byKGeceK0fOSccYgWrxFe/s2pzRQgVC6xCIDO1xQhfa4NM6BRrJayosLO1NhWDy3Ber9rxqQPhovo3WPys6uODTKN8=; 24:56wswEr73O2dQgVEMTKye5qsJPRxLck+aFSBwt2DOrgt+dBElgiDeYH2rTKwebTrLqgqtjM/11AX1A+srdw+2aNlZ0hyZe62QI6M+ryJHvs=; 7:NwzZN+RCcBvwkOgHIA7dcwEEUeYSeaJ3GomGaWfhGZ7tHBiKTSe56AhNkJoM+dp2eZaUjuJz/mjiWT3Y9Nv2l/jwAK4l3MTQF03aU6wcId7uLXWDgoHCCjHb6q9Ei9srnHkjhphwMQmKexeqNvkYLAJAsUGhJqt7zVcNKbHmGYKYPEhE0LzUiIBF+wB2ol0VAyDtvR94V6LXgpRHIRePxx7gO5UxKf+wGEZQWVERRGqN9XWVKt6oIW0o67T6bYY5 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 4a82dbde-bd6d-4cde-4b9d-08d57f8a1df1 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7193020); SRVR:DM5PR2101MB0872; x-ms-traffictypediagnostic: DM5PR2101MB0872: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(22074186197030)(89211679590171)(183786458502308); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231220)(944501229)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB0872; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0872; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(39860400002)(346002)(39380400002)(366004)(396003)(199004)(189003)(14454004)(478600001)(76176011)(575784001)(86362001)(106356001)(2906002)(2900100001)(2950100002)(7736002)(72206003)(966005)(305945005)(5660300001)(99286004)(1076002)(6436002)(6116002)(3846002)(97736004)(6486002)(36756003)(6512007)(66066001)(4326008)(53936002)(25786009)(6306002)(5250100002)(316002)(2501003)(186003)(26005)(107886003)(68736007)(8936002)(3660700001)(3280700002)(102836004)(54906003)(10290500003)(59450400001)(6506007)(81156014)(105586002)(22452003)(86612001)(110136005)(6666003)(8676002)(6346003)(81166006)(10090500001)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0872; 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: vZRlO7FyijygXnBO0q4SbX57v7IiarbGEG++obc+X3EHmiwAkDz3wUMQQIx7z2div7UFeZV9eZ8v/tsGN5v9aa464GbaNjcB2RIVUd7/iJC75y/6uRsEqqE5WIpX7K8N0TTpCZmRKKmN3ohus87jYiyqTzzNgRFpgKrwMsm9LU4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a82dbde-bd6d-4cde-4b9d-08d57f8a1df1 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:26:36.7445 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0872 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 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit 16c3ada89cff9a8c2a0eea34ffa1aa20af3f6008 ] With CONFIG_KASAN, we get an overly long stack frame due to inlining the register access functions: drivers/media/tuners/r820t.c: In function 'generic_set_freq.isra.7': drivers/media/tuners/r820t.c:1334:1: error: the frame size of 2880 bytes is larger than 2048 bytes [-Werror=frame-larger-than=] This is caused by a gcc bug that has now been fixed in gcc-8. To work around the problem, we can pass the register data through a local variable that older gcc versions can optimize out as well. Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 Signed-off-by: Arnd Bergmann Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/tuners/r820t.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c index 71159a58860f..4bfd64b0c0ad 100644 --- a/drivers/media/tuners/r820t.c +++ b/drivers/media/tuners/r820t.c @@ -410,9 +410,11 @@ static int r820t_write(struct r820t_priv *priv, u8 reg, const u8 *val, return 0; } -static int r820t_write_reg(struct r820t_priv *priv, u8 reg, u8 val) +static inline int r820t_write_reg(struct r820t_priv *priv, u8 reg, u8 val) { - return r820t_write(priv, reg, &val, 1); + u8 tmp = val; /* work around GCC PR81715 with asan-stack=1 */ + + return r820t_write(priv, reg, &tmp, 1); } static int r820t_read_cache_reg(struct r820t_priv *priv, int reg) @@ -425,17 +427,18 @@ static int r820t_read_cache_reg(struct r820t_priv *priv, int reg) return -EINVAL; } -static int r820t_write_reg_mask(struct r820t_priv *priv, u8 reg, u8 val, +static inline int r820t_write_reg_mask(struct r820t_priv *priv, u8 reg, u8 val, u8 bit_mask) { + u8 tmp = val; int rc = r820t_read_cache_reg(priv, reg); if (rc < 0) return rc; - val = (rc & ~bit_mask) | (val & bit_mask); + tmp = (rc & ~bit_mask) | (tmp & bit_mask); - return r820t_write(priv, reg, &val, 1); + return r820t_write(priv, reg, &tmp, 1); } static int r820t_read(struct r820t_priv *priv, u8 reg, u8 *val, int len)