Received: by 10.223.185.116 with SMTP id b49csp6357572wrg; Wed, 28 Feb 2018 08:06:58 -0800 (PST) X-Google-Smtp-Source: AH8x227nmyWiCn5uUNeVqnkE5mwUE/7jFuG/u6VPv5uv5Ojrmhy2PKkpJ9JAMy8MmYKOk5AdK2GF X-Received: by 10.99.190.68 with SMTP id g4mr14509554pgo.143.1519834018752; Wed, 28 Feb 2018 08:06:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519834018; cv=none; d=google.com; s=arc-20160816; b=UHaDWEEJIdM3Rn1Ul++IObHknul0cWurKU0HJEe3RPNIUbOsDP1U+lcNZKi6oIy2+9 iWTpSlwGVewrusH/wtvS0PWtSfzyq2pk5eyOO/QZ6BE97Av1Pi1Ps/yif+m0+TkhbxPv 3/Wcr4sp47U29DS2FZ/0MFYb3ZUDMY81FMJAiqedvYqbPcBtKXAyzS8OHoKTnl+8spGL 2KUsGJgrE8HbeYhGpWk+aNW8IQVLfuC7fx0gHTLo3gvsDVwQU5t4jKtYemn2GDrJ9rxv Jx0BKIp9e9Xcprs+XaLxyjUj7BiJhxpGszZ7B9G13mTABMcPZoCa9pB+M9wlPVwghPbN K7sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=50dZtgeg3JYIq120hrsmYUYGTdYbz9+4AKpG72YZ2d0=; b=wK/4/aUPhSIhZaIam5Au/00Me3jae1UkT6ZbjrFtmi61E+I/hSNvr2/OCr4UaHe1EW +1apibHzl3eiVvjKaSfOl14q9e2+eQ2dNAJ2g1f63J+PYz3vTbKriicCbORkAjL6Nxqw 4ZGwOc/uC/c5/psspN1aEJWIP5MR+Fh/dS/zjWih9qeqaGYLofli+qDHiXY00QBaSAD7 az9SDjbuSYtf6ln3I3TEdt3H9JVHElobJU6WES/KZ0tPRNYz9Pbh16d8xGz7hI7LcQ9P Ob8q0rLyv1l/vRZ6Ol0bYubPboVtzcvWcwmfxhnH0GWgM0JhK19WYvDM3JoA9au/b+Lp 3Uxw== ARC-Authentication-Results: i=1; mx.google.com; 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 d15-v6si1471486pln.186.2018.02.28.08.06.44; Wed, 28 Feb 2018 08:06:58 -0800 (PST) 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; 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 S934566AbeB1QF7 (ORCPT + 99 others); Wed, 28 Feb 2018 11:05:59 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:34908 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932438AbeB1QF4 (ORCPT ); Wed, 28 Feb 2018 11:05:56 -0500 Received: from [2a02:8011:400e:2:6f00:88c8:c921:d332] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1er3Yk-0006XU-9S; Wed, 28 Feb 2018 15:22:23 +0000 Received: from ben by deadeye with local (Exim 4.90_1) (envelope-from ) id 1er3Yi-0000CQ-Mi; Wed, 28 Feb 2018 15:22:20 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, ak@linux.intel.com, "Kees Cook" , "Dave Hansen" , "Peter Zijlstra" , "Jiri Kosina" , "Linus Torvalds" , "Greg Kroah-Hartman" , "David Woodhouse" , "Tim Chen" , "Thomas Gleixner" , "Rik van Riel" , "Andy Lutomirski" , "Paul Turner" , gnomes@lxorguk.ukuu.org.uk Date: Wed, 28 Feb 2018 15:20:18 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 174/254] x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.55-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: David Woodhouse commit b9e705ef7cfaf22db0daab91ad3cd33b0fa32eb9 upstream. Where an ALTERNATIVE is used in the middle of an inline asm block, this would otherwise lead to the following instruction being appended directly to the trailing ".popsection", and a failed compile. Fixes: 9cebed423c84 ("x86, alternative: Use .pushsection/.popsection") Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner Cc: gnomes@lxorguk.ukuu.org.uk Cc: Rik van Riel Cc: ak@linux.intel.com Cc: Tim Chen Cc: Peter Zijlstra Cc: Paul Turner Cc: Jiri Kosina Cc: Andy Lutomirski Cc: Dave Hansen Cc: Kees Cook Cc: Linus Torvalds Cc: Greg Kroah-Hartman Link: https://lkml.kernel.org/r/20180104143710.8961-8-dwmw@amazon.co.uk Signed-off-by: Ben Hutchings --- arch/x86/include/asm/alternative.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -124,7 +124,7 @@ static inline int alternatives_text_rese ".popsection\n" \ ".pushsection .altinstr_replacement, \"ax\"\n" \ ALTINSTR_REPLACEMENT(newinstr, feature, 1) \ - ".popsection" + ".popsection\n" #define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\ OLDINSTR_2(oldinstr, 1, 2) \ @@ -135,7 +135,7 @@ static inline int alternatives_text_rese ".pushsection .altinstr_replacement, \"ax\"\n" \ ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \ ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ - ".popsection" + ".popsection\n" /* * This must be included *after* the definition of ALTERNATIVE due to