Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp9984651ybi; Wed, 24 Jul 2019 13:33:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdpY2LtjfVpWku8pJfJixf4Aij1gFjz4hbUPkbv6rIZE3xSolWqFVVOossboHzkfQa7Fmy X-Received: by 2002:a62:38c6:: with SMTP id f189mr13118364pfa.157.1564000389205; Wed, 24 Jul 2019 13:33:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564000389; cv=none; d=google.com; s=arc-20160816; b=LPLvEBKb95OgL3hA3WlCJ2gNYPk5aB7Lz4HrLQRd1M9cQpKikenqlYmTM/92tV+6yh Wsga1DEeBlwSUx93BQ3x05qfNIVuyYlLdCM6zyD8S+jBr1qdQm7fTh1Au36EQjLq0PlF 4af1VyUuaKHNEKkWbSKJ+WDxYtaWVVBDKkQqqKAb1xRre3S591h5bafXVZEGJrV17+RP kbhJLCgw4Fa9uB3c8H/Y/MCWzIakFvIyEEo+If4CCmpA4qp6fKPIBKUV4Iv3T7heZcre Ty4n6/Rba+msrK9F+22+n/LQPkntkdLIEkGAvHvFq532SZYKx9RPPpkvDKrylMCLEINh H4kA== 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=hoXpDidqFCnXinn+zA8e6UNucsDtFXXc/UkRlQVNzmk=; b=MItEhC9Va/PdMDWWZCwDAAI51EWdabrgH5XfS2t9tZttBoo+yLLJLgf/pT7wOUryiW 4xIr9UdMcFpr5UdhmqEcsokGwhSyf/k3ikBKDxrNmOTxj+1353nlRKoXExtdIgHpxlpD fMpLZa1gJgF/b6lzoakZibpralgCcnJH/Ytsys9i1T8LQZmgvfsOoVWD7vd4V5aI3RQU cD1Upy07GK/1hgwyP9x7nfJngeu3ahJoSvlHcHpMqUqRWObOWCJw1rvDkMhB4sB2mmv5 8+4mpuOY4L8K0ur8jTOTSghli28th0PnFTVYAYpjm1nZpHsM+94ZL7WroymhsQfO9rov QiNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="on9a/NUn"; 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 j9si16500562pgq.555.2019.07.24.13.32.55; Wed, 24 Jul 2019 13:33:09 -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="on9a/NUn"; 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 S2388325AbfGXUbh (ORCPT + 99 others); Wed, 24 Jul 2019 16:31:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:50152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728486AbfGXTaO (ORCPT ); Wed, 24 Jul 2019 15:30:14 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 5BE5D20659; Wed, 24 Jul 2019 19:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996613; bh=w4us00/9sn9R8EktR5DtQjHif2aVMiSmqh/+yBf/PJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=on9a/NUna4d0iRN7PPXfCLS9agB9xyiE9qJ6VK7EgYVdNDAr6NUkbg5QO5YCrFj4a a4R7LtjEkGmJ69xVoYhY6xnUfa1sukhsNSeDxgHKNO+6XhV7UEECyrHzZxjukOnAyc qavGPzi4N+gpjfvpUayjWwgh0Js8detaA/uNjmEo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Thomas Gleixner , "H. Peter Anvin" , Borislav Petkov , Sasha Levin Subject: [PATCH 5.2 156/413] x86/build: Add set -e to mkcapflags.sh to delete broken capflags.c Date: Wed, 24 Jul 2019 21:17:27 +0200 Message-Id: <20190724191746.228619650@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@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 bc53d3d777f81385c1bb08b07bd1c06450ecc2c1 ] Without 'set -e', shell scripts continue running even after any error occurs. The missed 'set -e' is a typical bug in shell scripting. For example, when a disk space shortage occurs while this script is running, it actually ends up with generating a truncated capflags.c. Yet, mkcapflags.sh continues running and exits with 0. So, the build system assumes it has succeeded. It will not be re-generated in the next invocation of Make since its timestamp is newer than that of any of the source files. Add 'set -e' so that any error in this script is caught and propagated to the build system. Since 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR special target"), make automatically deletes the target on any failure. So, the broken capflags.c will be deleted automatically. Signed-off-by: Masahiro Yamada Signed-off-by: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Borislav Petkov Link: https://lkml.kernel.org/r/20190625072622.17679-1-yamada.masahiro@socionext.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/mkcapflags.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/cpu/mkcapflags.sh b/arch/x86/kernel/cpu/mkcapflags.sh index d0dfb892c72f..aed45b8895d5 100644 --- a/arch/x86/kernel/cpu/mkcapflags.sh +++ b/arch/x86/kernel/cpu/mkcapflags.sh @@ -4,6 +4,8 @@ # Generate the x86_cap/bug_flags[] arrays from include/asm/cpufeatures.h # +set -e + IN=$1 OUT=$2 -- 2.20.1