From patchwork Mon Apr 9 00:23:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132983 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp730644ljb; Sun, 8 Apr 2018 19:46:38 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/IhSAlLNSpHgteRQK9CYj5quSpWAEaAeAhf9oThfkGkmgEgwVIugyvmE0IOI8TFNBQ1QkD X-Received: by 10.99.133.193 with SMTP id u184mr24114490pgd.141.1523241998130; Sun, 08 Apr 2018 19:46:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523241998; cv=none; d=google.com; s=arc-20160816; b=P5SNp+UbulXIBYD7FIx9eLshXWb3VsBcmZ7G0AlBRJbFZAVV0S6wvqMQnOwxLOsuuu BHcFPpJSmecu6h6cs6tVmqY4Pf+6SInj/jv6QOZ2b7j1ARwEFXEM/CzSC+G69zSSpMVN QwZeBCzixucYE7b01jBUjbq6ZQIOT/qeKqLCHGj1rA9li/uHjR3ldIi4QUOHZ/oO9jkI WMqGN2R9G3IRpUMz2k1kc8X1MvIAvFKEKDLVrZwGxTLqYlgdvDIHxgZWqmYDYqS+ipyT 7BDvkUcb+Xo3AoNCjZ/Qa65CeKw8BrFfRddYEM83D2BTV6zWxDcbWQV2lm50yW+fL6H/ Nx6A== 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=99z+fxgPMBKZL6u4TzbomHMirrlh7wWYsm/yT2EFtmY=; b=X8DT/s12woWV0nRryGqnQLtEshvDc9FjHB8eco2hPdYgfUIm2FQVW+3f2qJQqkSzU1 RcgnbyzNyptWn+dLJxHQqUcUbSPyltG95GYC1t1PmaIOa/lUtEaIKorhBOYVZGpKUNkE pHo8FVZ16pXZiZx8EwKqdtziFrZjx6oGtwhPph/5zAEYa3OrarUWnG2a+oE8PGtnUstv jHbNFYgCY6qc2nhnooOvFtSgu5kRmzEUuR6XKPngnQKjGwzsKqShMkeq6WoVHTSX03WL 9rm+MzW7h3hBiYDT5N3GV2qoBFMnB7XjqKQWC0/WD9hWlNJpnaz+Bqfbdqs7pqrkNLRX 1v/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=VxAl+ox2; 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 g7-v6si4025739plk.388.2018.04.08.19.46.37; Sun, 08 Apr 2018 19:46:38 -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=@microsoft.com header.s=selector1 header.b=VxAl+ox2; 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 S1755350AbeDICqe (ORCPT + 11 others); Sun, 8 Apr 2018 22:46:34 -0400 Received: from mail-by2nam03on0126.outbound.protection.outlook.com ([104.47.42.126]:2432 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755409AbeDIA0l (ORCPT ); Sun, 8 Apr 2018 20:26:41 -0400 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=99z+fxgPMBKZL6u4TzbomHMirrlh7wWYsm/yT2EFtmY=; b=VxAl+ox2c/f98RXOGv4rEw3O9lovnxnbjY6jGOuFZAtz2h7JVZS7m5VR+oT7HHDQay3Tn/YGNbyEqBBSQnauATVESj3nSP+Ro02g7I8U96nvVqtQae7Pf/YGcYv58PlO77AgFHuTD/fXjsYvZOD0m3oLHYkHJh5+iK6GVpvWCsE= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0885.namprd21.prod.outlook.com (52.132.132.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:26:40 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:26:39 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , Ian Abbott , Stefano Stabellini , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 017/293] xen: avoid type warning in xchg_xen_ulong Thread-Topic: [PATCH AUTOSEL for 4.9 017/293] xen: avoid type warning in xchg_xen_ulong Thread-Index: AQHTz5jrjSKo4/+nHkeCZpDJhTwqaQ== Date: Mon, 9 Apr 2018 00:23:02 +0000 Message-ID: <20180409002239.163177-17-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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; DM5PR2101MB0885; 7:4EoMWnL7BUroOxFnqdk3p9sybPWRRtp0KgYBbjP62xcuRPqUJIzlPPwacnJe6vyIwPB2N4sAXdpj07iKZMVkSUZ7WbWourxmnFaWOGdqgtBjqpZr0pnsFKmqzJttA3yyhjGNIFhcS9lA7BnB+5TdG9MR1COZnHC+2SMvr7fkH/46aQNd98672muOycbwbOuSOY5EUvX1eV1fB/OSJb2Dw1DW0oR7/Ae/iwxAYQYm2lMb24Sa43fZoA+XalmftbBs; 20:2+FV9I/rM19DRKHvRfOZf+dmvzvcg1GifGEKwuxuiAUirUF07Rg4GF+638auNvYwSYVzrv/BRNaMGU4ZbioOK/N0JHWWnj9UZ2wiL1vAa8vkoDVRvntOfLTeCw5RgNgfT3X7ubu8mqY8JpmDsT3hoeh3KvVV77f2hGRVH+zSOzU= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 93eb7150-f20c-462c-dc74-08d59db09014 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0885; x-ms-traffictypediagnostic: DM5PR2101MB0885: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0885; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0885; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(346002)(376002)(396003)(39380400002)(189003)(199004)(2906002)(68736007)(22452003)(316002)(6512007)(5660300001)(6666003)(54906003)(110136005)(486006)(6486002)(102836004)(36756003)(14454004)(99286004)(86612001)(105586002)(72206003)(106356001)(2900100001)(1076002)(97736004)(10090500001)(3280700002)(5250100002)(6436002)(3660700001)(6116002)(3846002)(305945005)(86362001)(59450400001)(66066001)(10290500003)(186003)(81166006)(8936002)(478600001)(476003)(25786009)(81156014)(8676002)(4326008)(7736002)(2501003)(107886003)(6506007)(2616005)(26005)(76176011)(446003)(53936002)(11346002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0885; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: e2sEBElV2/zcZPcCyWlsRDfGWLuDnIyjaay0y0TEw0OXPjFcSsD1tuHnHyiXXiAVAzn+uEUqMTTclMF+p0xEIr3Qtdv7gPKWeyC1UJ2GP9NbgdyO6ak86XuU7gszxPKgv1tL3sdxj2GSDUAl0/aaX5OKPEt/9JT4SwyuGNqjzH+QWEr+WwMKSrl9LBCh/UBsqXEknhi79umC1p12vG29iizITvYBgso7rWEON3UORjWtLfUy31uJfF9RvQoIEc+aqGLIrhfpMd3MrwnMkBK3fXEkVXRWW3fRnIxe7BGE9bGHd2qXncEcqfMxnwSqEKzMwS6qkcJbotS3i2n980xKMj2DBYNvrZUQrcn6o23TthiUF4/wjaGlwpycNpz96yfaHWaZ088PQVusqXUPBxNJvRR1Gjx7wnh19ta/N4iwxKo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93eb7150-f20c-462c-dc74-08d59db09014 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:23:02.5810 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0885 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 9cc91f212111cdcbefa02dcdb7dd443f224bf52c ] The improved type-checking version of container_of() triggers a warning for xchg_xen_ulong, pointing out that 'xen_ulong_t' is unsigned, but atomic64_t contains a signed value: drivers/xen/events/events_2l.c: In function 'evtchn_2l_handle_events': drivers/xen/events/events_2l.c:187:1020: error: call to '__compiletime_assert_187' declared with attribute error: pointer type mismatch in container_of() This adds a cast to work around the warning. Cc: Ian Abbott Fixes: 85323a991d40 ("xen: arm: mandate EABI and use generic atomic operations.") Fixes: daa2ac80834d ("kernel.h: handle pointers to arrays better in container_of()") Signed-off-by: Arnd Bergmann Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Acked-by: Ian Abbott Signed-off-by: Sasha Levin --- arch/arm/include/asm/xen/events.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.15.1 diff --git a/arch/arm/include/asm/xen/events.h b/arch/arm/include/asm/xen/events.h index 71e473d05fcc..620dc75362e5 100644 --- a/arch/arm/include/asm/xen/events.h +++ b/arch/arm/include/asm/xen/events.h @@ -16,7 +16,7 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) return raw_irqs_disabled_flags(regs->ARM_cpsr); } -#define xchg_xen_ulong(ptr, val) atomic64_xchg(container_of((ptr), \ +#define xchg_xen_ulong(ptr, val) atomic64_xchg(container_of((long long*)(ptr),\ atomic64_t, \ counter), (val)) From patchwork Mon Apr 9 00:24:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132948 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp643596ljb; Sun, 8 Apr 2018 17:29:15 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/8TTUL/AN3aO6EOxHulTsBKM/g+IAjNa/ICl0kuPsocjK9R8wcKPKIBOdputBFz0FBHDAA X-Received: by 10.99.130.199 with SMTP id w190mr23706800pgd.15.1523233755668; Sun, 08 Apr 2018 17:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523233755; cv=none; d=google.com; s=arc-20160816; b=kJCW8cpNZT89PtA7SG9omP92ZJq70RpJj+g6ZDhJXkL8zZD4cFyZHOGKvZU4MIKXQ0 Ld35ePusXdnuY2lfX2SURgKq4R7EYEkCDvfUpsl04lgu0TvfMBuSryoNVh8DJQjYxmwH aIrETkFd35nqVji5IisjB34/YAODBs17eajbWSb5Olf9XJk/ZifPdWwnbj4edJoxzRmI vittmMsb37tvNEFdZv5v7Y6Ox+B9njF70+JPDELbAp36fI17Mo87c7tcX40UzTiapH7u ssIzSYW+9AkMOZABcMX8oHNoPOnPTlzk3KjTNkdvewRF2+kG+Inn23W3bnIIcbglPhyX k9PQ== 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=JzEawsSqucliaVg4V/r2dqON5iLgZCkKsx3ytkSV/Wk=; b=Y5U/W7rgB0YaGTo1/ntue6Dt9ifQymzMvG0WaWmbyKeLLUZ9rmYLh1fLslnTABzRR7 u5Oy2c51XBgMHr/wLMp3QX/nzU4sg0e4ZjGtWNmOJjCIEtSXope9XIsbLXsEgijtyndG P5LlIbcKzEuJwKrO/kx6EYx1UlwIESc/wSF9eNg8291bsckaWekkzg5fJhj8qsZitrNv qDOHQpBorxHn9D9+k57PVoC03REL0NrD9eh6mblwsMxbs5377LVvDnf4byJdJ6y5cG54 eq4o1LJXCaAdKckRwXy5dUqyC7iaXDQOj6fp1nNbV4Ku3bpzxeozlbYXae5cCSO/Xlvn aJBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=fCoV//gQ; 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 x6si10525878pgc.57.2018.04.08.17.29.15; Sun, 08 Apr 2018 17:29:15 -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=@microsoft.com header.s=selector1 header.b=fCoV//gQ; 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 S1755894AbeDIA3N (ORCPT + 11 others); Sun, 8 Apr 2018 20:29:13 -0400 Received: from mail-dm3nam03on0136.outbound.protection.outlook.com ([104.47.41.136]:25507 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752959AbeDIA3J (ORCPT ); Sun, 8 Apr 2018 20:29:09 -0400 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=JzEawsSqucliaVg4V/r2dqON5iLgZCkKsx3ytkSV/Wk=; b=fCoV//gQLQjCa8OJl99GZuGXRoU+ngvtE3YUOkTMbsnXigQBqSVOqnpj7TdKLDuMTSf8CUrnTBzT0uwz4s6jHpOC3naxg7SYXf4N8xyJR/xs23FWLWZJHaFt6XWQdns2BXZL0SpuO+VDpt3rWz6lU+PgRbjRI1dzNvizuHpY9AU= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0807.namprd21.prod.outlook.com (10.167.110.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.3; Mon, 9 Apr 2018 00:29:08 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:29:07 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Kishon Vijay Abraham I , Tony Lindgren , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 091/293] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines Thread-Topic: [PATCH AUTOSEL for 4.9 091/293] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines Thread-Index: AQHTz5kRUjk1USNMOUC3puYvI9IWww== Date: Mon, 9 Apr 2018 00:24:05 +0000 Message-ID: <20180409002239.163177-91-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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; DM5PR2101MB0807; 7:0Nf7PPzQZShq8ewci4EmoW55tgobzhw/CzLWAFgkOjdkylMoiEIzmTg3riMxuIRnQWI+HzgZWvVYAzlnTl6bxBMG/nzsZNm3hka/Xejho1Ckkj2MbEWnNJhxf9SxLX8rUAhgqyYolimjp8k+6Ds4q0DooulcdJqmTwysA+x5LM2bCh3S6aGSMAvGQThn+hXUi73EJT+a7Id8Fv+rf59P1zr6Y+CaF1k2yf1zbhyQY/+JoriS0lISDafeT9scylWA; 20:NkjdQ3/wTChhVK+PRvagfn0Ic3hEmTQALlcsXvZLp+2SFJL3Y+CpCw8Mv1DjgCdFPcSLAm3rX3zjNijXyeMPL6IRIij2pUQPVI2X4rdwJ4Ps686JRtPJ6AENQEWLfbzBQADzZVklFOXTK+ud2/nuuIBmQrS6IDq6ATV2bdsUdDk= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 4478f0a2-1669-47d2-b39b-08d59db0e849 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0807; x-ms-traffictypediagnostic: DM5PR2101MB0807: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(3002001)(6055026)(61426038)(61427038)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB0807; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0807; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(39860400002)(396003)(366004)(376002)(346002)(199004)(189003)(14454004)(4326008)(54906003)(25786009)(53936002)(2900100001)(1076002)(3280700002)(6486002)(186003)(2616005)(68736007)(110136005)(11346002)(10090500001)(6116002)(107886003)(3846002)(36756003)(8676002)(72206003)(22452003)(66066001)(26005)(6512007)(478600001)(3660700001)(81156014)(86362001)(81166006)(86612001)(7736002)(305945005)(8936002)(10290500003)(6436002)(105586002)(316002)(59450400001)(76176011)(5660300001)(476003)(106356001)(2906002)(6506007)(446003)(2501003)(99286004)(5250100002)(486006)(102836004)(97736004)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0807; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 8s2OGEvIbxBZ8nqErP2ii0oAlOCiM6OawLqsKe1v4q7pr8jkT/423Y1/NB7Fy8JKjTfXvOtkP6oDwdIwLumUcFFs/W9pTlpXwYZd9NRyQNJ6w9Mot4IFF9CSOo2D+LtRsygp8EAJHiXYibtOy6UpErImLb5vl7qwp0Bz+vXsp3y9QPyXQsS2FZVxCUcgICfzy2nDL81ESHXUswI7dgZ/siWY7MZvFpjxGuSOnHEEeBJVQfFN7G1eFCF8J41OAe0Aedj3/m5UwywNkxa5Ukiz7Nhb3byc7N83UBwvk72ycrZkOagsTZ74KnUzRRDsP8f33eFmKEq3bT7efqQZJZZLblo4lJCZcBbOt9/D56COD/4Nn1L985fl4PmpFvPvcn7ABG4tRbef2LryLuyj12A6EhdcgJFNds+z5Tz1guQrKHo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4478f0a2-1669-47d2-b39b-08d59db0e849 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:24:05.3156 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0807 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kishon Vijay Abraham I [ Upstream commit 8f323f8d8332455b633acabddb15483d64757965 ] The dt binding documentation of omap-hsmmc recommends using "vmmc_aux" for IO supply lines. However commit 0af28cc92690d8c ("ARM: dts: am57xx-beagle-x15: Add support for rev B1") added it as "vmmc-aux". Now that anyways it needs to be fixed, use the generic "vqmmc" binding instead of the deprecated "vmmc_aux". Fixes: commit 0af28cc92690d8c ("ARM: dts: am57xx-beagle-x15: Add support for rev B1") Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.15.1 diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts index ca85570629fd..0e16913d75c4 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts +++ b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts @@ -20,5 +20,5 @@ &mmc1 { vmmc-supply = <&vdd_3v3>; - vmmc-aux-supply = <&ldo1_reg>; + vqmmc-supply = <&ldo1_reg>; }; From patchwork Mon Apr 9 00:24:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132950 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp644300ljb; Sun, 8 Apr 2018 17:30:20 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/PnPdNRxaG4bNr1Ibk8A1IwQdlsiJoN2T0lA4usvPsi6EDQFwwFVIpbWLW/71MR5l1Ube3 X-Received: by 10.101.72.68 with SMTP id i4mr2636926pgs.265.1523233820138; Sun, 08 Apr 2018 17:30:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523233820; cv=none; d=google.com; s=arc-20160816; b=UlQg1+pUe0cpMEufQwcYsEZryaVrukZ6CCBq4ucNYcrTORINlk+cXXz9KJGB+ZSC25 E0gkWQ6Hyxyh681hcJK66WBrzO5+x5GYUseNHCVXxWWPP9Q6lyFKW1TLL4bTri2Mbx6u q0KXH9SqDQjyzU7Zgqh0058D+Em5xoq0zSY04l8i3K5e1tcv4NyP+OUIJ6AKj7DU/Acy l2uriFreWB1Btxv4Tc07W1sf7RSo42ybePKk/ngAJ7wsT31yqJpi/JqukRUysPU/BWez 7tnzuLWQmt4qGhIjFyXhFJTd2N9wW/3rRd1YFFSnCwGHJn+a2mcoq1+pQRA/nWLCMbnN K50g== 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=2EGIMksSo+7vcZSA5cIcSDECJNIfWsRxKy3I4+8n9Ks=; b=xx20uJOt6wA5wnwOq6cmoS568KDFrDgkIX0/URCSB2Owg5/MzSD9FLLZA9DH5AhP2R MgxGKMGEu+QdvIs5rd1gjuzoG6jAAPStQ0+g02IX3HxOqucUtxuDXQ/bWdpQJNHC4qC1 vZHEvdT2aZzHUVR9q6hvadXL7Ovtn/wyHJBt2/dgPlk2KjUWGQCftUNdh5bTlECy7um2 EBUYnB0rQuDZBrnRFWhaCK5Oqyc7sJHBcwKWtHHbHceLmetZhj7OR9fsN/XeJBWH7rT3 Wj0wC85dM2mofJQ0v/TuGtiDmFp7Vn0QtHw6+Ai63x/IAcymXgWAmJD4wtiEo0k826Mo xWjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=WyTt+Z1W; 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 j3si10227182pga.364.2018.04.08.17.30.19; Sun, 08 Apr 2018 17:30:20 -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=@microsoft.com header.s=selector1 header.b=WyTt+Z1W; 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 S1755137AbeDIAaS (ORCPT + 11 others); Sun, 8 Apr 2018 20:30:18 -0400 Received: from mail-sn1nam02on0125.outbound.protection.outlook.com ([104.47.36.125]:10314 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753157AbeDIAaQ (ORCPT ); Sun, 8 Apr 2018 20:30:16 -0400 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=2EGIMksSo+7vcZSA5cIcSDECJNIfWsRxKy3I4+8n9Ks=; b=WyTt+Z1WqkKFXuHs4THFDGwWzYYn7o9ZlTV9LCHfrk2x1NO4r5zLvn0Dm9cNcz+fwA7yUBH8YkvxH3AjuOeIo+vQTOc89YOjndV3j3QrZYfGc2FMXnq/eunyAgEi43LQIUZraion7UdPpcHJkF1Q0VdupaQjpz7tS5o+m2WaXIY= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:30:14 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:30:13 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Dave Martin , Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 121/293] arm64: ptrace: Fix VFP register dumping in compat coredumps Thread-Topic: [PATCH AUTOSEL for 4.9 121/293] arm64: ptrace: Fix VFP register dumping in compat coredumps Thread-Index: AQHTz5kekh3e+yDfDUiAdhGxujLg3Q== Date: Mon, 9 Apr 2018 00:24:27 +0000 Message-ID: <20180409002239.163177-121-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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; DM5PR2101MB1032; 7:+cMFxhihnrSPpcWG6TIHCCsC0S8VLcPq0GppIuiPukgJp3V2DHrhbTOrjHBXb4HpULpU8oCTC6gJYSS81B1I3hWqw+V4O3RyoVirM5B/IN01jkCdeJcNDt4hkin0lGYdtuTHi9QlGTWqkhswuocQNd8PjU4UP1dcMBnLBP4+5RVy/HtAuvIDudt9DSxfZMGZmZgWZO+wREq5Xgwp/yl2K+ab0JWWjqRRsNJtST2GvmZXYGHsymMPULc0pGPc3H6g; 20:ezUVueUuh1x8grdHfTVD/v1y6AlMHvUbiLnb4W0xKQ5BMjp9NI/BChfgKa0Gy3iAwUXZm/mGYG+9/ckAMVFMlMTgk+KGCuUYRNZ1t8oH2WrYw8qpNTbM4gfB7u2u5MUUKQ3tgC/5NiuvGgvqtEoB7O6nsPls8dABaxX4ulMtbr8= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 69e26b49-fbae-4c22-0fec-08d59db10f97 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1032; x-ms-traffictypediagnostic: DM5PR2101MB1032: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231221)(944501327)(52105095)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1032; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1032; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(346002)(396003)(39860400002)(376002)(366004)(189003)(199004)(5660300001)(76176011)(99286004)(10090500001)(2900100001)(105586002)(305945005)(7736002)(107886003)(2501003)(5250100002)(14454004)(53936002)(4326008)(8936002)(68736007)(25786009)(86612001)(3846002)(66066001)(1076002)(486006)(316002)(72206003)(22452003)(106356001)(186003)(97736004)(6436002)(6116002)(476003)(2616005)(478600001)(6486002)(10290500003)(2906002)(110136005)(54906003)(6512007)(81156014)(81166006)(8676002)(36756003)(11346002)(3660700001)(446003)(6666003)(86362001)(26005)(102836004)(3280700002)(6506007)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1032; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: kADEPeQYF3xCrXDacJkGaoXvo5yLyhClXdis4JPuWrrN1GdRrch90VDSgZlzobxpzemfPjvFRTSKK/Y2oI9hIIWhLPcD6MowcsQuvlFb8at/PtjkVk70D9Wl7rnD7DXV8TgkRbfoglkKSa7aBDH6PfBka0BlmclQbv6ucrs+EsFDWwvXMiXAfKQUFVXOZvxb8VHkYQl+zb0eTsK9Zow4rot0FZ/JLNcJiMiiANX0k05EBr+WWI/SxH03JM/vu+TA4a/dmCTrkcALNBw9+25YctSI8c9a81NeQRzSRwbiqpApG1w5xcVZtlKe037pgrpqM0l6Vfg8aUYDcNw96m/UqMGCvjAALrMZnvyKb8Vtm0dVWYVmI1xxi5R3wakyqt53ttVia4SF/XbxxwYYEMlsKvcDTbyms/0WhMc+av7uDSI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69e26b49-fbae-4c22-0fec-08d59db10f97 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:24:27.4406 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1032 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dave Martin [ Upstream commit af66b2d88a76574d55e81d712292abd34beb6178 ] Currently, VFP registers are omitted from coredumps for compat processes, due to a bug in the REGSET_COMPAT_VFP regset implementation. compat_vfp_get() needs to transfer non-contiguous data from thread_struct.fpsimd_state, and uses put_user() to handle the offending trailing word (FPSCR). This fails when copying to a kernel address (i.e., kbuf && !ubuf), which is what happens when dumping core. As a result, the ELF coredump core code silently omits the NT_ARM_VFP note from the dump. It would be possible to work around this with additional special case code for the put_user(), but since user_regset_copyout() is explicitly designed to handle this scenario it is cleaner to port the put_user() to a user_regset_copyout() call, which this patch does. Signed-off-by: Dave Martin Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/ptrace.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.15.1 diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index d1fd560b3a2a..5c78b64369cf 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -896,7 +896,7 @@ static int compat_vfp_get(struct task_struct *target, { struct user_fpsimd_state *uregs; compat_ulong_t fpscr; - int ret; + int ret, vregs_end_pos; uregs = &target->thread.fpsimd_state.user_fpsimd; @@ -904,13 +904,16 @@ static int compat_vfp_get(struct task_struct *target, * The VFP registers are packed into the fpsimd_state, so they all sit * nicely together for us. We just need to create the fpscr separately. */ - ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, uregs, 0, - VFP_STATE_SIZE - sizeof(compat_ulong_t)); + vregs_end_pos = VFP_STATE_SIZE - sizeof(compat_ulong_t); + ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, uregs, + 0, vregs_end_pos); if (count && !ret) { fpscr = (uregs->fpsr & VFP_FPSCR_STAT_MASK) | (uregs->fpcr & VFP_FPSCR_CTRL_MASK); - ret = put_user(fpscr, (compat_ulong_t *)ubuf); + + ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &fpscr, + vregs_end_pos, VFP_STATE_SIZE); } return ret; From patchwork Mon Apr 9 00:26:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132974 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp691299ljb; Sun, 8 Apr 2018 18:46:40 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/KZfJ7X1zEnKxwb1JyAgCH63S0F484adME9Xds6SnLvj3awEGDUBbaXw8zApyQ1d8OVv9g X-Received: by 2002:a17:902:2d01:: with SMTP id o1-v6mr36004012plb.309.1523238400802; Sun, 08 Apr 2018 18:46:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523238400; cv=none; d=google.com; s=arc-20160816; b=kpJy57YrK1tk+tKwKwPcDT0+ONJXNVuorKIieSY4XHTkKQZzCeSiYr6zAWxCX5ffQs czG5qdzFwyaheevacXpsSfHZOk724o/6JOtl97MfwMT5vQDAhOVjnkZG8PRQaYq408Lq yRK8wm711lBA1HyetN+JUWLMaHeQ4MJY8wHuqfoJkEvOviK/1pj9VtVJt2TA0D2POlmd N/nRF/4R1O6tQNCggv3RsNDGCqJoC9Hi1yovvdw+KlOKnMvp8NpTIQvSJmCKk8P8OO4r uqkL4iVfWPJusSnKyPvOhLqqCvWKEUjFhjvZ8WEjzIjL1NYQvhSDj6ND4RN8tl/1iRa1 9QOQ== 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=QxC1ci7ByVz4cHTk8jiSSEBb7ew0d3RlgefFsjr6Ymo=; b=wU7USd7phAW+eQUDgYV5nfe0DxoFHdJE9kOgyncCEYRdC3C6JRd0H3+GFPHGcjoCb6 QDGq3GFkfgcYLb263Oqn4KLwkL6swFL0UWfObv9jsruHgTOMKpM56OPI6LnPtVErnWQG C7Z/SaMDxreQa2ir9FCwmH1ES4LAoMsRSNryNZkZxQDzsHUmml9ckJ68fdJTiaPkUwxI tolorv0nBSQcXTXglioaPV1ZpJSZISpzSA+yDRNbzC4ZHaPHI4F4/MC5fOpcXlkM0xvT 6SsXqvJZCS5H0DzrHeXerKsKEvHtUE8w56ovy+HWvE/gvDWhGSqbk0bm89CXcX1FNRWQ f2Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=jWk7WNaW; 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 m1-v6si13583627plk.577.2018.04.08.18.46.40; Sun, 08 Apr 2018 18:46:40 -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=@microsoft.com header.s=selector1 header.b=jWk7WNaW; 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 S1754840AbeDIBqj (ORCPT + 11 others); Sun, 8 Apr 2018 21:46:39 -0400 Received: from mail-bl2nam02on0114.outbound.protection.outlook.com ([104.47.38.114]:2685 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932444AbeDIAeH (ORCPT ); Sun, 8 Apr 2018 20:34:07 -0400 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=QxC1ci7ByVz4cHTk8jiSSEBb7ew0d3RlgefFsjr6Ymo=; b=jWk7WNaWOJfflix30OxD+JaTvSGreGcBp7wtbKmk+F2aP/NBERhaY6Uu9eZ2TdcwnctNjm9KipQB5sszonddWph9w4gB3wb6bkeX5cwOdFG2k68/wiJ4CVUfFCoFuT/b+ltxq9o11v25fWJvgprnSte26QFxh70FGFVvZUR7mec= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0984.namprd21.prod.outlook.com (52.132.133.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:34:03 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:34:02 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , Thomas Gleixner , Len Brown , Andi Kleen , Nicolas Pitre , "linux-pm@vger.kernel.org" , "Rafael J. Wysocki" , Pavel Machek , Bart Van Assche , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 268/293] x86/power: Fix swsusp_arch_resume prototype Thread-Topic: [PATCH AUTOSEL for 4.9 268/293] x86/power: Fix swsusp_arch_resume prototype Thread-Index: AQHTz5lkevEXBdGU60yGk/7NLrKv2w== Date: Mon, 9 Apr 2018 00:26:24 +0000 Message-ID: <20180409002239.163177-268-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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; DM5PR2101MB0984; 7:sEvjXVb/wBsEbx/uX7k2YySI3uHIDh8tDnyuF78USkHS1bXFrLlTFPKFRvr647Z8TqEMjUVBZytOsaFEnHjLdDdL8yytyYWEKE5v5+39ZkzDyc1xLc6tHt7IByLyDC2OistIwaMF3hcTq2KZyObkGPqYoR50odYiRgvh1XQ/gbQZr94SGbFtJ2tEP9h6p6l+bWzCGzzvICOsCCboNE0FLlZh/S3C7RhoKHxOj11TdvRdlZnYR4M8oLOcWaN7VHx6; 20:3m4tRQBsn3GwMBOwNXbsZ6Y7geezu1R0ql+tLgAjV9t0Yu4YmzfYk6JYbPZbvGVf9I/Sam1JWRBhDUEI0JAp4jyQtL4wrwy8+WJ3+5qm/JmeR7GWQRYlzK326iW5XzDARBC/e2HIhNvfxqa1/DHykm4i9p7zmDOZZ1NpGXRwCrE= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 34194d9c-ace0-4c98-924e-08d59db19820 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0984; x-ms-traffictypediagnostic: DM5PR2101MB0984: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(42068640409301)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0984; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0984; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(39860400002)(366004)(39380400002)(346002)(376002)(199004)(189003)(26005)(99286004)(2906002)(14454004)(97736004)(59450400001)(8676002)(81156014)(81166006)(8936002)(6512007)(106356001)(76176011)(186003)(3280700002)(10090500001)(36756003)(6506007)(66066001)(3660700001)(72206003)(478600001)(6666003)(53936002)(2900100001)(105586002)(102836004)(966005)(2501003)(110136005)(54906003)(5250100002)(486006)(1076002)(25786009)(6116002)(6436002)(11346002)(6486002)(22452003)(4326008)(446003)(7736002)(575784001)(86362001)(305945005)(2616005)(476003)(6306002)(68736007)(3846002)(86612001)(5660300001)(7416002)(10290500003)(107886003)(316002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0984; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: KElItWfIc2DQwXGqa3QhADBZFu2ONBP7D+I9bOSwI//WOeVJ0441l6wVsYW6lzzihRUow33Yiu9zo91CUoV8bvYDAw+OIQx6R2NpfVYcEujVwlUUlXuxYIjv3q6BBLPc+E7ekDUFIJKhYkD7qvNux7Tgc6CQyOlf+Sl6tZamfMUa9r4GCYPyfpm9yYqejveBurjm4z015X8+E1dIvms5pUfgtq40nIC5FGtN+3ZFGWNGljz33/B0FeeJm2WdlRX00u2q9svHmk4eyGs+wIAs7fcdUiaZFTADiFuzB8LGY2XPQOHGkMNfwQTQrQ85fFRVRGZID8xtointbKin9oiDVkavD5+6QEOL6feBhot1xuZsuoCN/A86ve8zubJ4GkChQ3Moa6tmdA2oHHaXBnZIhVGhXvKRPZw17QM8yAH4sik= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34194d9c-ace0-4c98-924e-08d59db19820 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:26:24.8164 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0984 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 328008a72d38b5bde6491e463405c34a81a65d3e ] The declaration for swsusp_arch_resume marks it as 'asmlinkage', but the definition in x86-32 does not, and it fails to include the header with the declaration. This leads to a warning when building with link-time-optimizations: kernel/power/power.h:108:23: error: type of 'swsusp_arch_resume' does not match original declaration [-Werror=lto-type-mismatch] extern asmlinkage int swsusp_arch_resume(void); ^ arch/x86/power/hibernate_32.c:148:0: note: 'swsusp_arch_resume' was previously declared here int swsusp_arch_resume(void) This moves the declaration into a globally visible header file and fixes up both x86 definitions to match it. Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Gleixner Cc: Len Brown Cc: Andi Kleen Cc: Nicolas Pitre Cc: linux-pm@vger.kernel.org Cc: "Rafael J. Wysocki" Cc: Pavel Machek Cc: Bart Van Assche Link: https://lkml.kernel.org/r/20180202145634.200291-2-arnd@arndb.de Signed-off-by: Sasha Levin --- arch/x86/power/hibernate_32.c | 2 +- arch/x86/power/hibernate_64.c | 2 +- include/linux/suspend.h | 2 ++ kernel/power/power.h | 3 --- 4 files changed, 4 insertions(+), 5 deletions(-) -- 2.15.1 diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c index 9f14bd34581d..74b516cb39df 100644 --- a/arch/x86/power/hibernate_32.c +++ b/arch/x86/power/hibernate_32.c @@ -142,7 +142,7 @@ static inline void resume_init_first_level_page_table(pgd_t *pg_dir) #endif } -int swsusp_arch_resume(void) +asmlinkage int swsusp_arch_resume(void) { int error; diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index 9634557a5444..0cb1dd461529 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c @@ -149,7 +149,7 @@ static int relocate_restore_code(void) return 0; } -int swsusp_arch_resume(void) +asmlinkage int swsusp_arch_resume(void) { int error; diff --git a/include/linux/suspend.h b/include/linux/suspend.h index d9718378a8be..249dafce2788 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -378,6 +378,8 @@ extern int swsusp_page_is_forbidden(struct page *); extern void swsusp_set_page_free(struct page *); extern void swsusp_unset_page_free(struct page *); extern unsigned long get_safe_page(gfp_t gfp_mask); +extern asmlinkage int swsusp_arch_suspend(void); +extern asmlinkage int swsusp_arch_resume(void); extern void hibernation_set_ops(const struct platform_hibernation_ops *ops); extern int hibernate(void); diff --git a/kernel/power/power.h b/kernel/power/power.h index 56d1d0dedf76..ccba4d820078 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -103,9 +103,6 @@ extern int in_suspend; extern dev_t swsusp_resume_device; extern sector_t swsusp_resume_block; -extern asmlinkage int swsusp_arch_suspend(void); -extern asmlinkage int swsusp_arch_resume(void); - extern int create_basic_memory_bitmaps(void); extern void free_basic_memory_bitmaps(void); extern int hibernate_preallocate_memory(void); From patchwork Mon Apr 9 00:26:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132972 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp689208ljb; Sun, 8 Apr 2018 18:43:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx495hHEqXEwcz+nCmauyTllTzvy6DFYxM8lLnzNWfBpyBLZ192LE56G8J3v865rg9gaAkg3I X-Received: by 2002:a17:902:2c83:: with SMTP id n3-v6mr34609243plb.140.1523238215229; Sun, 08 Apr 2018 18:43:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523238215; cv=none; d=google.com; s=arc-20160816; b=VkngKVbHZtXp/IvybCMyQ0ov9aybfzTWZ/e9i9OtrJXh76ZEL+MsDX2KWnCttenSSB Z99gkfHffVGTHus8w+0gaPl2CRF/GYDV4WlHOUL5dqcVeBW2mw4y0mMKK/IlGmMiR+zc lIOe7Pl6b1bED4w0h6qdRqIVm90rQLAPb7y5hvfxbu29d5f0v0Oc3R8xDWp9XwDiTe9p qwIitaFc5A6mQ+zWtrn4CufOwZSzj8bY1gaETtR4MkI+kVOSJWDaA9vVBhfojHhlWMc2 7vPjGbhza3dPv+hPRSf4KOWSrF+6icbIMPW1RUNI9lUUCgVrHcyXTZV8Ko2b5ucntbn7 49rw== 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=g9g/TxhqKXIUz/9Oe+mVQjol7voaRQktGXND25O/39U=; b=mbT3/7SsrRpy5Q1kt3lHUeeZQucX4epjY22/8Ij61HXXIZyAKnG4SY8SnxfmWB0/24 xsQ0sqjw52ok7pyD1Shj8gIY7OkhfCNsg8nRmF5Shdp7Pie0GfJtkreOcOKKFbzRVvoG cH+8ATQd03SMom4Dk9xkBV5UEUnvalXynfaZzplXBB4s+JPf4rt0Pmt3wJ3GZ+/NVi+7 abx65hol8sRyY7cn2McyHD8RfGXnHb3MDES8NRwhVMBQhdtZDNJLPtRMX7lwapY0LodZ JAJNv4VvG95VdmzzADzX7yrV+7LK0vuQqV1w4eonKkMqc9ruq5lX4eaLLWyFgiC4snwc xTqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=h9p7OIqn; 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 v10-v6si11082231ply.74.2018.04.08.18.43.35; Sun, 08 Apr 2018 18:43:35 -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=@microsoft.com header.s=selector1 header.b=h9p7OIqn; 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 S932509AbeDIBnd (ORCPT + 11 others); Sun, 8 Apr 2018 21:43:33 -0400 Received: from mail-bl2nam02on0134.outbound.protection.outlook.com ([104.47.38.134]:51004 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932258AbeDIAep (ORCPT ); Sun, 8 Apr 2018 20:34:45 -0400 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=g9g/TxhqKXIUz/9Oe+mVQjol7voaRQktGXND25O/39U=; b=h9p7OIqnEsfDL4S8v/c8YSEeDHlK9d+/nP4C6seGDcMwBXbOS+djm4OleDN0WIFu22f4qse82cLoz9H+GeEog7t7GJMefQWRp7klC46ltvl4u4ix+dBn6iVil4wIO3OBtVE7s9WSysrieOJ1UWOLPtloj4Io9Aolx8PqcA8mCG4= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0984.namprd21.prod.outlook.com (52.132.133.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:34:41 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:34:40 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , Steve French , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 280/293] cifs: silence compiler warnings showing up with gcc-8.0.0 Thread-Topic: [PATCH AUTOSEL for 4.9 280/293] cifs: silence compiler warnings showing up with gcc-8.0.0 Thread-Index: AQHTz5lqbFn/rkDrrUG/fAEsCrDBFQ== Date: Mon, 9 Apr 2018 00:26:34 +0000 Message-ID: <20180409002239.163177-280-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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; DM5PR2101MB0984; 7:7bVvhwOvewK/TQw/XtKDdM4t5E8FjLgF32fEEJ0SaikMZcm1eDPz3s60UpC4HrumT0LZQbAhEnVKYy5Y8np4XKIS3ZL7fVFPbkakLCJgyyWfc60pCk5Wqo8nnHQkS/M3AZq2Ktv6R2yjbYPkIo0jg990YmyMQmRLVq8UmFiTdWzFzuItozHv68uATTOlpk5dKXV9cAhjhdX2VAcJ4miOVsa8IdkYu/9WuNTgmsgTt/zhZBTh9MufcIpe/fHiWzM7; 20:kMli92Rk1nsskw20nY9xkRiwGEk2AZijNTGz5RXnW9fqE/ukMzuhOZ9Xk4gVjzTKVkHCtMq7N+E/fjHyhICg98RfiOl1YDi+n+l07mJ8fN3qa2G+40h7nML43nXRSye/9eCUIXgDZNX6SwUGadKnlqy9lvMZh8YVwCpNdBuOfHc= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: acac5e02-07da-4b87-df52-08d59db1aec6 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0984; x-ms-traffictypediagnostic: DM5PR2101MB0984: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0984; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0984; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(39860400002)(366004)(39380400002)(346002)(376002)(199004)(189003)(26005)(99286004)(2906002)(14454004)(97736004)(8676002)(81156014)(81166006)(8936002)(6512007)(106356001)(76176011)(186003)(3280700002)(10090500001)(36756003)(6506007)(66066001)(3660700001)(72206003)(478600001)(6666003)(53936002)(2900100001)(105586002)(102836004)(2501003)(110136005)(54906003)(5250100002)(486006)(1076002)(25786009)(6116002)(6436002)(11346002)(39060400002)(6486002)(22452003)(4326008)(446003)(7736002)(86362001)(305945005)(2616005)(476003)(68736007)(3846002)(86612001)(5660300001)(10290500003)(107886003)(316002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0984; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: LL/Q00NUMuir/oVHjZAF/X++6UfPONwJL6KWDyVBM5LjecQm/ujieEmTbAjf8lTx3k+wM7fYcATC9yM4v6fQZPMhz4x0tBeMg83DeYry/3k/i2gPt+JPCIQY0WUhq4UnLAGE+qYPzUfYUYBJTuhoMdEWTcpv+ZnZ0AzAhiu95H9qe0fMgaq+I754X3qHIbOmY7ua+/fs+ZTTpxyrLPgYVIKLuZPcI0M9xwBJ97O7pntpZLAkyodNG0hUkY5TS7AQhfom7PhSpvsXzOh3F3+IpIUleeu0h6PPVYzY2PyfjHFhNreg0B0sHncFPTKtLcoUux1TpHoADMpjO0Hp692ziH7CsScVF/BJLQ/Ssz/S2aFSsIH+c5dReupOynMuCIiJF2Nf7jElyVMPd8+YrMxGvDLu3mF0fKy8F5rI34ZkdV8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: acac5e02-07da-4b87-df52-08d59db1aec6 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:26:34.7696 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0984 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit ade7db991b47ab3016a414468164f4966bd08202 ] This bug was fixed before, but came up again with the latest compiler in another function: fs/cifs/cifssmb.c: In function 'CIFSSMBSetEA': fs/cifs/cifssmb.c:6362:3: error: 'strncpy' offset 8 is out of the bounds [0, 4] [-Werror=array-bounds] strncpy(parm_data->list[0].name, ea_name, name_len); Let's apply the same fix that was used for the other instances. Fixes: b2a3ad9ca502 ("cifs: silence compiler warnings showing up with gcc-4.7.0") Signed-off-by: Arnd Bergmann Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/cifssmb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.15.1 diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index cc420d6b71f7..d57222894892 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -6413,9 +6413,7 @@ SetEARetry: pSMB->InformationLevel = cpu_to_le16(SMB_SET_FILE_EA); - parm_data = - (struct fealist *) (((char *) &pSMB->hdr.Protocol) + - offset); + parm_data = (void *)pSMB + offsetof(struct smb_hdr, Protocol) + offset; pSMB->ParameterOffset = cpu_to_le16(param_offset); pSMB->DataOffset = cpu_to_le16(offset); pSMB->SetupCount = 1; From patchwork Mon Apr 9 00:26:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132951 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp647111ljb; Sun, 8 Apr 2018 17:35:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+/vkIj+PQKIWd3ZuZ6CXVtYR5rwbsTWdYEqM5pk/9Ox5WpcQ/kYyn4mfPiKWpm7Vi0c6fn X-Received: by 10.99.3.144 with SMTP id 138mr23806110pgd.364.1523234109154; Sun, 08 Apr 2018 17:35:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523234109; cv=none; d=google.com; s=arc-20160816; b=MQqk+kapZAvYDcSixfxyZisKMd1TQ2p2HUbcsK1ezZb1SAoPvf0kjjg9xSamAr2Su7 tDP2PQSJTQSUqfF8LfqYQmvGZNNwbWJIkIumCYwJLz7Ft9A+7aWaFVcCL5euW3lyEvB0 odZH4BmzMnLWo8L+rAxuw6ZhvaeC9PXqHc6T7oQxBDgLDBYDr22HfxyueTRqA6UJluVG 6KE/ylFfSX56AEmlXuK4GLnjk6XublVZteFN7IZCUwyO4c56sShqRzxKperjRXfD4P/R gRIJZ/lLtXTQltrwG8XDVFmXaS0fGXUX8E1Yg7QHlw1HXiA77JnXmTFiS/cT7OxKd51l h0Ng== 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=xv+MzhbRqk6xoDlsTW4eQIjUoBlwxhsDdVI7cKoOnXw=; b=tVpvqODcyUj538h+S+5kcI5O4qbBxn9GFCrpeRNjVcSQtx6cbdVi7dPBUmApdHL+cQ k+AUU6xauDL/AcoVgUu6cyOqi+VkOqxCNXbZhLuGqUZkmgDNNWz/gZDGekYQM3YSRV18 Nh+/t/Juf3YoFsQjjwqJIY3jLymY9U+NZHxBFM6jVwodlccZyGv3Rmp6nVUcw1LnWj2p s+0xaQJHqAlTibaz3NXw/MTozwrl9JfKlR2vb4lsEkOIjR1qimYwhjVGtGIkDIaRebkE Bnu1Jb2st2uGHSwcmm6VfWgPxd5igl1MXKbVMlSN3mqiJITo6bDg9rQdlNBpr0H8+i8A 8P5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=F83qCKav; 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 n8si10534199pgt.480.2018.04.08.17.35.08; Sun, 08 Apr 2018 17:35:09 -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=@microsoft.com header.s=selector1 header.b=F83qCKav; 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 S1755925AbeDIAfF (ORCPT + 11 others); Sun, 8 Apr 2018 20:35:05 -0400 Received: from mail-by2nam01on0115.outbound.protection.outlook.com ([104.47.34.115]:46358 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755215AbeDIAey (ORCPT ); Sun, 8 Apr 2018 20:34:54 -0400 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=xv+MzhbRqk6xoDlsTW4eQIjUoBlwxhsDdVI7cKoOnXw=; b=F83qCKavyxGobMroE6msIaKQwWGIYRrbt767y76fe0MJPOtYpZv02HkUcgTPiWxmjmi7tlqYNsfxhRn3pJ4kWTyuLELQLC1B+Z7sP1J8BYlpzlM2M+ARMOuwTuA70T2VoWz8MB/NhRQSysIDsOJx7YHWJh+26f1i4lmTjO1B8uk= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0806.namprd21.prod.outlook.com (10.167.107.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.3; Mon, 9 Apr 2018 00:34:47 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:34:47 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Will Deacon , Linus Torvalds , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 290/293] locking/qspinlock: Ensure node->count is updated before initialising node Thread-Topic: [PATCH AUTOSEL for 4.9 290/293] locking/qspinlock: Ensure node->count is updated before initialising node Thread-Index: AQHTz5lv3gsVWtfZGUasLrStRynHag== Date: Mon, 9 Apr 2018 00:26:43 +0000 Message-ID: <20180409002239.163177-290-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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; DM5PR2101MB0806; 7:1ndrlA44A433YTBiF9hzuo1/r+CnFonUkhwRowYMBaXrrgpknjXUF0M36g9Sy2yiiOPKS3X4hZEBOfDc2n4IqOan3rXL8/+eTdCRGd38SvidhJerCMNJvV8rCEeP9ECgdiGKcnmWOhwLaLvK6nudd9k8g1GXrz+ZG8FwmcCkZeCLwYFyuUvxJRtQ0gQGzRLE+Sr8X5IGtulQRgYITOaC3QKmvmzhFZeIeYHzIcH6xEarzpEnHoYYEORxy3i4uh1v; 20:+DDIE07lPdCbTsnGxuV+pvwKvUCk+riDnzEDCvMcKScn4PT55WhQl+D0/s7jDj3OOpYiGE043QDHrF8jO2n1F8Axw36j6whfAcUFk7IqLykn7WihbI1gQ/jNT9u7pMuxAqisgIghwVQtOBCt2wTUGl1h/i5TRETacYVxkwTP15w= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 9e1e4cc9-963b-4cea-aa9d-08d59db1b291 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0806; x-ms-traffictypediagnostic: DM5PR2101MB0806: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171)(42068640409301); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0806; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0806; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(376002)(396003)(366004)(39380400002)(199004)(189003)(51234002)(2906002)(25786009)(2501003)(10290500003)(476003)(11346002)(446003)(97736004)(5250100002)(68736007)(2616005)(102836004)(6506007)(59450400001)(3846002)(3660700001)(486006)(3280700002)(305945005)(6666003)(99286004)(5660300001)(76176011)(1076002)(186003)(26005)(7736002)(6116002)(81156014)(81166006)(86612001)(4326008)(105586002)(10090500001)(2900100001)(54906003)(22452003)(316002)(36756003)(110136005)(107886003)(8676002)(6436002)(478600001)(53936002)(66066001)(6486002)(6512007)(6306002)(86362001)(966005)(14454004)(72206003)(8936002)(106356001)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0806; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: XxQAIEH+exP27PlsnBWaX1ypGExaaqEgVY0sT2yIKqpPiK5f2gHAHL921ak3XsJ+u9uEmPUsb3chzgM0K7O3YcNmkwSr07UiIEJ4Qt9mNw/kCASvb719FGfsaypzqtvDvgCVdRp6CXE2rk5ADp4uoOXWGqz0j+uDqnKPuUOy/5mak6oS+s+U+xmnMF1Afw1UXQc08JM67fdV4KrKexxyMSU2O2WA5VKK1VSUwrMYj3kBw85G6YWbJ6QrjZaf6pHzEaLJwFrTnPaYP5W+fU/yhJFN0+1Jm9j7X8FWBvah8gP5r48c+3RQaKXdXh5Lqe1rlsQu8AvqTJM+qv74fPFV+/XzZniWdG6kWv07xlQ8SzxcjMKCKzIN5TOgahGGlzsn0CJFgi0mI0NA9fTTUqyaFnqkkp13dAeOaFM7jhhML0Y= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e1e4cc9-963b-4cea-aa9d-08d59db1b291 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:26:43.2384 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0806 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon [ Upstream commit 11dc13224c975efcec96647a4768a6f1bb7a19a8 ] When queuing on the qspinlock, the count field for the current CPU's head node is incremented. This needn't be atomic because locking in e.g. IRQ context is balanced and so an IRQ will return with node->count as it found it. However, the compiler could in theory reorder the initialisation of node[idx] before the increment of the head node->count, causing an IRQ to overwrite the initialised node and potentially corrupt the lock state. Avoid the potential for this harmful compiler reordering by placing a barrier() between the increment of the head node->count and the subsequent node initialisation. Signed-off-by: Will Deacon Acked-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1518528177-19169-3-git-send-email-will.deacon@arm.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/locking/qspinlock.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.15.1 diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c index b2caec7315af..a72f5df643f8 100644 --- a/kernel/locking/qspinlock.c +++ b/kernel/locking/qspinlock.c @@ -495,6 +495,14 @@ queue: tail = encode_tail(smp_processor_id(), idx); node += idx; + + /* + * Ensure that we increment the head node->count before initialising + * the actual node. If the compiler is kind enough to reorder these + * stores, then an IRQ could overwrite our assignments. + */ + barrier(); + node->locked = 0; node->next = NULL; pv_init_node(node);