From patchwork Wed Aug 14 17:01:09 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: 171322 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1103952ily; Wed, 14 Aug 2019 10:12:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqzQJ+HekUr8oYQTSLT3sK15Bnp79Mtywnp4kLJjU4ExbSLm/ZgxWSb1upk3DNt/C323AWsQ X-Received: by 2002:a17:902:2ae8:: with SMTP id j95mr396084plb.276.1565802754311; Wed, 14 Aug 2019 10:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565802754; cv=none; d=google.com; s=arc-20160816; b=dZENZ57mTY17c9WcDp98FsXe5KIVPoTvEm/8kBZ4O2t4sJExSLDXZN4v/9vbFS0BYe ixdSA4ZFoNZQLIcmaYOnqmOmp+RsF5WH1cb+HKv0Py/8hod5ydnjoDl2a7DUwuIViYol R8uAVW7DPav/Hf56gjSAJRFPeNWtusSoFrLNkmg+vSlCzlkKqzSpV8OR1WAlr+QTtKkn RxjKp3QzhRs8K5dQrnaFgLuu4ZiKJ8XhnL/O38GtvqBR2DTrroDNyblh7O7nLmQNxyo0 6/JxxgpopDfGvOlQLNy/TziAHRCH+KWErCKYzGYnfD6cV3mMWXBiFsKbF4ZnNgjD1G1n hGfQ== 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=Ao0LBxhuTpIVTc5M+2qYapFXkoDiC/FAp4kCPwE2esY=; b=WaVhLFwMtyiWWh+J5bmFkpf7UL9JY2kD9KoLOzkU/Ya+nFWjMPzFx6fCZKUKMQnHxo Ex11gIhExdwV4paVW01J7iL2WRFAgfx1wZaU1rO+h2CPkM5UNaVS28u3DJI9mVgAQqww swLVpzSmM+ZNJP0Tp08nR4Xj9WEneO9UeVHDLdNjDk+r3qEH36O/YYIwIHQkOEZLz+GG oYjnuxsyoBtkco04ViIusBhc9uYvT1imyam6TmOG9HqpjQaUu/P2Qv4TelF5+TkMkujW 7kbMLl7FAEdZV+6Z3NqtTRXC24n2PQzFQjH0JFpr1/KeC6vdSiOuez1ybVET6IU5f84A iIug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oWuKlmy9; 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 m15si78531pff.267.2019.08.14.10.12.33; Wed, 14 Aug 2019 10:12:34 -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=oWuKlmy9; 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 S1730752AbfHNRMc (ORCPT + 28 others); Wed, 14 Aug 2019 13:12:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:36342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730742AbfHNRMa (ORCPT ); Wed, 14 Aug 2019 13:12:30 -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 6A70F2084D; Wed, 14 Aug 2019 17:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802748; bh=o4LAQK483Q6DdzmPzHeYVkEq9+wOBvdyI/oGyKuoIJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oWuKlmy9RfohKf+3JD3DRt5DHTmffDBXcMISNjuR2fF+95foCsnGai3xMO7RPpe6p mnWYx8GzL56KdOMuNz3t9CUdId/ALExLSiTJtAWU6XGIIPDCTODSs852AaR9b3u3Jf YHhrYeMjgiR6uZtca6SfHLEHcsfyqS0OrXj8OwD0= 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 4.14 11/69] lkdtm: support llvm-objcopy Date: Wed, 14 Aug 2019 19:01:09 +0200 Message-Id: <20190814165746.249357318@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165744.822314328@linuxfoundation.org> References: <20190814165744.822314328@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 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/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -69,8 +69,7 @@ KCOV_INSTRUMENT_lkdtm_rodata.o := n OBJCOPYFLAGS := OBJCOPYFLAGS_lkdtm_rodata_objcopy.o := \ - --set-section-flags .text=alloc,readonly \ - --rename-section .text=.rodata + --rename-section .text=.rodata,alloc,readonly,load targets += lkdtm_rodata.o lkdtm_rodata_objcopy.o $(obj)/lkdtm_rodata_objcopy.o: $(obj)/lkdtm_rodata.o FORCE $(call if_changed,objcopy)