From patchwork Fri Jul 12 12:19:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 168945 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp827844ilk; Fri, 12 Jul 2019 05:35:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4CNAXcztsWF3bJcIZ5XGKLJITVzcbjOk+t4t7GMYmNpEFfLweU84Ld2/iPlsdCNJalcE1 X-Received: by 2002:a17:902:e582:: with SMTP id cl2mr11355975plb.60.1562934930180; Fri, 12 Jul 2019 05:35:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562934930; cv=none; d=google.com; s=arc-20160816; b=Sxj6GIeBISCfriWGVJS6g+o+lhZgsHYBvSa60XhEG2sJGPh3/AC1M8XdxC1gUcrkWJ aWp94ndP4fwMc/q9qRYtC5CSuupsFtsbnVjZ7oFXlhBSgLqzFH+JsO3PXTTtlG3fecM4 lQYG4BOODfDfcwz5A6JfX+T1OcbX8OOyONMYSnqUAreeJL7/K3wOpnhhjwPWGNNCnuwP nvTUbtrRSy0S1kbUQGNZ7LJmW10+GTpae6azp0KMZdV2cl16bMo1c7eciYzYnpsXUx3g YB10Uh8DlDIxzt9JOEMQl5gpARWeqD4MYF1b43LD0QKKYfI9QVF+hAlNheHS4ZhZsg3f 63DQ== 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=EvGskLrLl3F9kyli8z/7m15SNEiqGHGVXp7u7JiAsFQ=; b=jBmw2NYJr6hUDh8fCglXgbjVTAiFdcXC6UGkngzkyjDu1NNaohQQ2YBQCT8/0CXLV/ ObH3nBZXdyQusYOVvDFkuNYRSa7C7NxMEwtAUMIbJjTXa5CEtQPHR/yb4O+VVMGh/ei3 Y8GDdajPf6aV1nqrgAvATqZf38OJuHw9YnJ34vRmehy8MA+QwIdnxeCL/3IGmk73CpUi WUv0OzES+nhUG73og0B8Rt75XL+ra2gnmHAIKsEfvdldCouolcWFL3qRrm+cpe9bp4xw OSrUVfnLhwh9su+mMjCiR5blo6HnJU2bn7eZw4dnMmD7kHi7l2/iSqSGS/F/gGdBVtJN sbwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=s4zBoowr; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v16si8368635pfi.142.2019.07.12.05.35.28; Fri, 12 Jul 2019 05:35:30 -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=@kernel.org header.s=default header.b=s4zBoowr; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729224AbfGLMdr (ORCPT + 13 others); Fri, 12 Jul 2019 08:33:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:53192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729656AbfGLMdr (ORCPT ); Fri, 12 Jul 2019 08:33:47 -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 DEEDF20645; Fri, 12 Jul 2019 12:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934826; bh=b30BjwC86bSBzRsL0WzOkPFpGQCDV3H1PobzYZ/QOtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4zBoowrEqKbxGhe/Jb7p8kcS+F7FUWsImFPJSspGEe67Sw42ZJRJ0BL5J+I1Iu3m 2MVvuZCkPpOWlbVAoOYMA2mFF5x4tO2PlRt0/J7+/yKK+a8Gy3maIT1weW8nArbpTD GQZnjyLvzo8hmhWdCCoTW6RArBkSG6OdKmOWJ16I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nathan Chancellor , Alan Modra , Jordan Rupprect , Kees Cook , Nick Desaulniers Subject: [PATCH 5.2 41/61] lkdtm: support llvm-objcopy Date: Fri, 12 Jul 2019 14:19:54 +0200 Message-Id: <20190712121622.846887375@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121620.632595223@linuxfoundation.org> References: <20190712121620.632595223@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers commit e9e08a07385e08f1a7f85c5d1e345c21c9564963 upstream. With CONFIG_LKDTM=y and make OBJCOPY=llvm-objcopy, llvm-objcopy errors: llvm-objcopy: error: --set-section-flags=.text conflicts with --rename-section=.text=.rodata Rather than support setting flags then renaming sections vs renaming then setting flags, it's simpler to just change both at the same time via --rename-section. Adding the load flag is required for GNU objcopy to mark .rodata Type as PROGBITS after the rename. This can be verified with: $ readelf -S drivers/misc/lkdtm/rodata_objcopy.o ... Section Headers: [Nr] Name Type Address Offset Size EntSize Flags Link Info Align ... [ 1] .rodata PROGBITS 0000000000000000 00000040 0000000000000004 0000000000000000 A 0 0 4 ... Which shows that .text is now renamed .rodata, the alloc flag A is set, the type is PROGBITS, and the section is not flagged as writeable W. Cc: stable@vger.kernel.org Link: https://sourceware.org/bugzilla/show_bug.cgi?id=24554 Link: https://github.com/ClangBuiltLinux/linux/issues/448 Reported-by: Nathan Chancellor Suggested-by: Alan Modra Suggested-by: Jordan Rupprect Suggested-by: Kees Cook Acked-by: Kees Cook Reviewed-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Signed-off-by: Greg Kroah-Hartman --- drivers/misc/lkdtm/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/misc/lkdtm/Makefile +++ b/drivers/misc/lkdtm/Makefile @@ -15,8 +15,7 @@ KCOV_INSTRUMENT_rodata.o := n OBJCOPYFLAGS := OBJCOPYFLAGS_rodata_objcopy.o := \ - --set-section-flags .text=alloc,readonly \ - --rename-section .text=.rodata + --rename-section .text=.rodata,alloc,readonly,load targets += rodata.o rodata_objcopy.o $(obj)/rodata_objcopy.o: $(obj)/rodata.o FORCE $(call if_changed,objcopy)