From patchwork Sun Jan 30 09:55:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 538461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 283ECC433F5 for ; Sun, 30 Jan 2022 09:55:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346943AbiA3Jzq convert rfc822-to-8bit (ORCPT ); Sun, 30 Jan 2022 04:55:46 -0500 Received: from mail-eopbgr90089.outbound.protection.outlook.com ([40.107.9.89]:33040 "EHLO FRA01-MR2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S239760AbiA3Jzp (ORCPT ); Sun, 30 Jan 2022 04:55:45 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R17SYY9om7iJQ4lEHSBKbi5beJU+og3HkH7GAQ73Uttiv+rmvgCWvL/u6Th1+vPeXhWvtCo9Gy2yMoupElAssb+XW/n2LVq4WvcP53Y8ES7wbm+GI7bwMIVOqlfW/I+bYzIcnVb11UmsQ+skfXi5vnN5ji5JfqazrsmzdpHXaRfE252yKNIkOUj3gNgus5uEgJWAgh6lf8owJkoyVEoSplZaZXadqU3S/xt/A6Xot2A250wms5IdD5a+AiOTNvrd9lfxzOdNrG+ME1VQ1g41n77WSLVZcYsNSCwxytvRdCD7nCNiOkGgkrcHRqCSyTLs9h7uE2DaqQjVvaxh/IwdpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H0pFT4jon4M/wf4hXEJ8fVFZZtbHSN2U6qzJj/M7OZ8=; b=epPsf0rcl2kBWnTqU1wIeDzP1QvnLmjPr8SsJ2n2YOpgz4ZCRvlWhsbdnL23GkGPbs2DCzObkdtmSRmcjh10xtzYYTOMHNWmQaQLxbVMRXTf10sDy/6AsIBApIk37l+c63uJImU/aeSv45y4mxl8/5zpNkEBwOs3YMpTm24N9ztGnNh/OhMxBExPXbawtbZoD4EpwH0y1H5fkwKjkTJl6w8UBnb0IUYHij3Lb9zTnMydbagIGkdfi7OEJ9+ff9H1tz7chcbzfQXbnezNjiuypIF3PwXYxCBn9pAc5iJtxs34mAq3+nGaja2aTmvbbc22Wv5SfgvIwgLcLsQOClMBmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by PR0P264MB0825.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Sun, 30 Jan 2022 09:55:40 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::c9a2:1db0:5469:54e1]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::c9a2:1db0:5469:54e1%6]) with mapi id 15.20.4930.020; Sun, 30 Jan 2022 09:55:39 +0000 From: Christophe Leroy To: "gregkh@linuxfoundation.org" , "stable@vger.kernel.org" CC: Christophe Leroy , "linux-kernel@vger.kernel.org" , Kees Cook , Arnd Bergmann , Nick Desaulniers , Nathan Chancellor Subject: [PATCH] [Rebased for 4.14] lkdtm: Fix content of section containing lkdtm_rodata_do_nothing() Thread-Topic: [PATCH] [Rebased for 4.14] lkdtm: Fix content of section containing lkdtm_rodata_do_nothing() Thread-Index: AQHYFb+JVDWALiF3l0KHVv16Qql+pw== Date: Sun, 30 Jan 2022 09:55:39 +0000 Message-ID: <32bbc122ba24b863d048f51ff13fe391b16b9f2e.1643536487.git.christophe.leroy@csgroup.eu> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fbc67731-7884-47ab-c800-08d9e3d6ac1e x-ms-traffictypediagnostic: PR0P264MB0825:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:644; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: /+dXRUFOJ4aUWvYamRNF8HSCsKwY9cb+PAWMh+llUdScchSnEOUSGbOvWSJdEx9DobComWT5uv16K9gsSgsJBxpoGSjf1kHuBOnmHL3FOS2uJ6Iag0+UgDQZjfNxhYvVUdDKSFMSWf+hYzkK2aTl1/XmhQdU/g0PvxFDV0Ei5LNUuaFR7qNHo6iFd+5VjVmevBrq5h6pv1o7JtPn9NUDs6gZnauYRPjf2MjpCXqxzP0/6uVT4YLPEjSyRbUwlrqfdpkkaAgzmfWZtTDHEHDxLDgj+paOOWs+TdhUovF36Pu2p0o4QK0CVgN3/WmxqB3VMj4OBqSsGxG2CU0UZb6UQSk+dFj6s3PLzrswrvO21HbGDHH+lwKe6gVtnR4ab2Ha8YeTNFBNOXBGOh+AezKF4l4OuT293FfXtjOpSy51Qy12j81oVPtAzXZrv9gXLai3CIiAUu3B2S5oE6bdTiuy6+ikaSejP4FGStO0GeGtCuoxxe4TaUEAWVbH/17JQwB8kd7wEF6dw1VHqlbnUFw4uxaHA3gq10pCdZn5jBMZIMgiVcTU+WZap/logIb2p1qlCv4cFGZSjnqLZhGBV5xemzYQBb4Cu49clZEahJ46tHX7gRs25jMP0U6st+8Vad1+Ieq8ygiQ+8MrY+WxY3q8xY3vPbL9FQkrIe1OIZFcJOQXid93n+TpsySmMqqsN8lvtywArF+S4zB4/PP0BvYHIBQJFIvj+1wBymOZJE8pV62DQpMjDB71TRLJEmzIFEMvDci3i87IQ2CdMajsIKVR1BG4mUZb2Mfc9TeemJo4f5k= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38070700005)(4326008)(316002)(122000001)(86362001)(83380400001)(508600001)(38100700002)(36756003)(66946007)(76116006)(71200400001)(91956017)(66446008)(66556008)(64756008)(66476007)(8936002)(8676002)(54906003)(110136005)(6486002)(966005)(6512007)(5660300002)(44832011)(6506007)(2906002)(2616005)(26005)(186003)(20210929001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?wrPCRg89A0YLr9KWFTZAsto?= =?iso-8859-1?q?nbpbzIMGBLdqb5BZvyhMYezCgoyDOk0xQB1XxI35CWeFWXX3q/8GeSp5iNhq?= =?iso-8859-1?q?GWrYdSawRfsoQdrpTC8ulTc167z9FohwYRUOvlHPrAvrnlua15OkjG8XtJIh?= =?iso-8859-1?q?AjF6ZDv83UI4LqhcDSUWNm+5QlAJ+d1oL4FsmCmNb/ES0z2DXZgfCItKrVjp?= =?iso-8859-1?q?HGQxcD8vmFNBib8cttWfR2UsjggCkEAEE9LayXDOJkJWqgoUulRYQRx2i3L4?= =?iso-8859-1?q?iiHKREX+tG2vua+8R/1cset2lmCVZ4qaZOzWNiTy4olZxYXo5LvXGC/4wCwq?= =?iso-8859-1?q?Oa1OVJTSs+Bou8wz4KmJlTP1bEOocgUHfl/ADFDBNAOj0+Vt2+iizbm7sxsO?= =?iso-8859-1?q?Wlf4CTMIeUP4N9+lsLYqlI6H/fyCc1jKG9mydQMhPNaBYEnCGy1SJjLlIxpF?= =?iso-8859-1?q?7evsMuI5ylygqC/CB5++Avz2Qz5UAKChhS5rzVzNYywg3+MUTZZ5ezdDwJiM?= =?iso-8859-1?q?Qkv5bCcpgHBasPznem0MKkx4OZj2cPwQiWIn2TLOPCLMxGT5IRPo7fnUkn4R?= =?iso-8859-1?q?BP4ypjIkAq+6kQDg7jwDvZhG7k6DhSxRAhQGBUh2nRECnPeu7C2xn1kf2Fc5?= =?iso-8859-1?q?wjzU6QtxcWwoH5yukSjCLNuo7JJXRGm7nAxC/9FyHtvWr0JHBbbN79p5uInv?= =?iso-8859-1?q?3bk2F5DCLstwvb6CkfkBN8qq9njtVlbb/zpQ2g2RshU43Kh1skqvMiQmF0Lk?= =?iso-8859-1?q?uIuKX9lE2S8dCiyvxiRpxfDMRolyWtG81iM5TBX4zu5ii/ORRZ4fyIxJ8Dc5?= =?iso-8859-1?q?0ILogeMnnyGUh03xWfFJOwfamarQQPyiy8HR9ZHwMmbKIOZozu1AXSuc487Q?= =?iso-8859-1?q?bmGryu86QpPLMy+lbVM3skJA0/bgTW0srjcbPMoBObWXsfI88eq97qSWWBIW?= =?iso-8859-1?q?HdvmCNxKJfNljg9zKZoF2PEuA5INzBVbFOZH1qZp8XfLZv66Nz425XItTi+J?= =?iso-8859-1?q?Jd8NYTYMCFScORL44RCOxxsNI23UoMr63PNmnCqVqj/ra1pXE+vlwrQhajNk?= =?iso-8859-1?q?JcDdYg+okUS6SLjoDRNSodDHvk8qswVEH6csWMNCfAJSI/BB+LsQWgMRIp9P?= =?iso-8859-1?q?9NZ+aYXQbXUqusLDCy6Ri5BV1lLJ3yj+FqurLgnpXpR3tz2XSkM/v3CTwgeC?= =?iso-8859-1?q?r+BeXD9pABSAdkqA7R6dIlOn75kYZuUSuo1wxPbFZ4AZ2+xLKiBNH6vc03eU?= =?iso-8859-1?q?MZ9y4LIlk+rTVRF/MvA3/X8xXiIHGyfAKbglvFBc56SMsmmfjj5afi7OIVXs?= =?iso-8859-1?q?Yk+9KfGcBrYc8CL7nSvY+tonhaJF8Ccnw4zsITgs8F7AiO6uWbJn8oRAz4l8?= =?iso-8859-1?q?yd3srIP/+pbQOfXh88CuiW6IGCBUyMR9DEsp7sLX/o1Tv3hD5xkUFMjQYqut?= =?iso-8859-1?q?FBhxwscArV6yLvhh9AivGkzONzLKaUEQ/zWyPO+uspVzBmOqhqb8mtua5MSJ?= =?iso-8859-1?q?eZOdLKjkXSjVmMTCOj4Ka/5olssQdP2H6FQXb3hMWoVZNsMgy3bURc2clAFM?= =?iso-8859-1?q?U7Yn63k6Hk60Ptpsb4krPWvcG6AfSV0HodpVNTubksde0jvLs6ri9TbvXPQS?= =?iso-8859-1?q?ONLJFZ9hba6XLindQ/uiWdnWd+n1ACwnUYQPyvy+wzsKoCJRfbHFwfyck7p+?= =?iso-8859-1?q?3lBoyojl1Dkh4zTfLijp51ctSkt1xLSiGqZ0i8Vxqb7uXccet450SSlvUjKA?= =?iso-8859-1?q?ndS4=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: fbc67731-7884-47ab-c800-08d9e3d6ac1e X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2022 09:55:39.9215 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: aWQbLYGaXCFjdJzGipn57jJuXi6QkUWMWor17DhPKKUEcMjk1v1BLaJ1UjN8gZQRNk7J16DaJQx/cBmy9xhzFw3K59qrrIv2qWKrf8DYdVU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR0P264MB0825 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is backport for 4.14 (cherry picked from commit bc93a22a19eb2b68a16ecf04cdf4b2ed65aaf398) On a kernel without CONFIG_STRICT_KERNEL_RWX, running EXEC_RODATA test leads to "Illegal instruction" failure. Looking at the content of rodata_objcopy.o, we see that the function content zeroes only: Disassembly of section .rodata: 0000000000000000 <.lkdtm_rodata_do_nothing>: 0: 00 00 00 00 .long 0x0 Add the contents flag in order to keep the content of the section while renaming it. Disassembly of section .rodata: 0000000000000000 <.lkdtm_rodata_do_nothing>: 0: 4e 80 00 20 blr Fixes: e9e08a07385e ("lkdtm: support llvm-objcopy") Cc: stable@vger.kernel.org Cc: Kees Cook Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Nick Desaulniers Cc: Nathan Chancellor Signed-off-by: Christophe Leroy Reviewed-by: Nick Desaulniers Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/8900731fbc05fb8b0de18af7133a8fc07c3c53a1.1633712176.git.christophe.leroy@csgroup.eu --- drivers/misc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 76f6a4f628b3..cc0df7280fe5 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -69,7 +69,7 @@ KCOV_INSTRUMENT_lkdtm_rodata.o := n OBJCOPYFLAGS := OBJCOPYFLAGS_lkdtm_rodata_objcopy.o := \ - --rename-section .text=.rodata,alloc,readonly,load + --rename-section .text=.rodata,alloc,readonly,load,contents targets += lkdtm_rodata.o lkdtm_rodata_objcopy.o $(obj)/lkdtm_rodata_objcopy.o: $(obj)/lkdtm_rodata.o FORCE $(call if_changed,objcopy)