From patchwork Fri Jul 12 12:19:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 168943 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp824429ilk; Fri, 12 Jul 2019 05:32:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQu1LqyYsO6p35HVh/pgaM2qVP16LOrJQrYyi+xGuFaeCTtLTGos8o8VbFBybfTi6pRpLU X-Received: by 2002:a63:181:: with SMTP id 123mr10862049pgb.63.1562934755284; Fri, 12 Jul 2019 05:32:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562934755; cv=none; d=google.com; s=arc-20160816; b=Az7QaYOOuNpRoDEg6aXTJZhYokD8sESUVYIEnGZrpnKgEhMo7ELcneAYRSa2VWNYpN Xh0VKx8gZg+5zb/0lLsXCCiIaf3ywhe+9/OtqMZaQMNbMe3AzfVXDZl8qKBZnCGmT+AL HSYlD3S4JHSA/bMXpz4CfNMD5vC3sNeN1X+ZU4uAzWtXFmBsOWyPryy0t2Z4l3YD3oRU 9PALyvp8NHDlNHnlIBAt/MySe5Pl0F+ozf1ZOAA6yMWKRIL9HGbyUl7eZMSTkwIWvxqa Z/wcOLZkX59XHwPwYK+u7mEZzzoXdqu0YNqCk6J2oFf84icRgSIV8zHQn+kTG+YTTUWf Skjw== 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=suc8UgqZoMUGVFgkhDOyNepKTxClo3hHD76ckX5cm3Y2gxGRPgGTHr0C1jeM0RHP5L qCIlPg7QIk/mBMoxnxnrXFqOiN4XfK/EL0D62fQpZNdIcUAsKM3JpvN4xSfOdhvH3g/n TjYUwXFlpBapzlAs5xsUsYeNbF3MnSIaFPmlh9UVno2AI0UHvbDeszD6vM7zXuj5Q8BQ MWyaw7EHjiNnmukmwPzyStHqp0RH2Nxw9P+B9fXuB4ZVRty+rS6JzpTpElxefOfaVBFI CBB/PJ7/i5myblyNYCdNqNNiK3JKkeadHQNKCTlNyIkwxj9upxKf5olYUdwUcipyG41z ckPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VAyvRIPH; 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 v16si8368635pfi.142.2019.07.12.05.32.31; Fri, 12 Jul 2019 05:32:35 -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=VAyvRIPH; 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 S1729365AbfGLMbo (ORCPT + 29 others); Fri, 12 Jul 2019 08:31:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:48672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729356AbfGLMbm (ORCPT ); Fri, 12 Jul 2019 08:31:42 -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 25347208E4; Fri, 12 Jul 2019 12:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934701; bh=b30BjwC86bSBzRsL0WzOkPFpGQCDV3H1PobzYZ/QOtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VAyvRIPHrEBLAke4ovRUlshhpe/kH4kuG3gf0zJN1clDKQyKK+ZWgwRSjHAeppryR X4HwkWkvydoGCsXBqIKIEsWpLrWpfyWHTUvOqlObEuWde8sVfTZYRPxwVAlRXqNwva Xtp5f9NxhOVEwGW3eQZ+m9/Ib+B/w4YmWHTtRKaw= 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.1 124/138] lkdtm: support llvm-objcopy Date: Fri, 12 Jul 2019 14:19:48 +0200 Message-Id: <20190712121633.497228796@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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)