From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751876AbdISMoQ (ORCPT ); Tue, 19 Sep 2017 08:44:16 -0400 Received: from mail-he1eur01on0108.outbound.protection.outlook.com ([104.47.0.108]:48576 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751590AbdISMoM (ORCPT ); Tue, 19 Sep 2017 08:44:12 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aryabinin@virtuozzo.com; From: Andrey Ryabinin To: Dmitry Vyukov Cc: akpm@linux-foundation.org, Andrey Konovalov , tchibo@google.com, syzkaller@googlegroups.com, Mark Rutland , linux-kernel@vger.kernel.org, Andrey Ryabinin Subject: [PATCH 1/3] kcov: remove #ifdef CONFIG_RANDOMIZE_BASE Date: Tue, 19 Sep 2017 15:46:46 +0300 Message-Id: <20170919124648.28963-1-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.13.5 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0401CA0057.eurprd04.prod.outlook.com (2603:10a6:3:19::25) To HE1PR08MB2827.eurprd08.prod.outlook.com (2603:10a6:7:2e::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eebd9d9e-a37f-43f5-9057-08d4ff5c1fdc X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:HE1PR08MB2827; X-Microsoft-Exchange-Diagnostics: 1;HE1PR08MB2827;3:Ykh7G5c1d+4i/1YYj0oPVHLADAF7ilpknlJRS8716oI1+wRM71oL4Zs9euwsut9EveDHpXW9A6UotvLi3orNepNLuoZLBc/IsdAEL24XXMJ1biB2usKT+dVEHTZe2c8HOsXQfw/E/X7fDLh6NXqcMruXzZ2cpPH2spe0PB3XkfMSbl8c0CQw7tcx9RFkQRjkCAHzyfMJBuPwYU+ik2hn5tsOdzZtk8G+oRIjt3y7NAiJGUW3EI9FP4R/fDI6LvDn;25:GKePe+sz684xRB0kJvJviomtjmKyyCn++6ZZIod6k1Qn7UvN+VZjD/dsm/rbbWjyd1Y7TDqjGOQ7u13gT9VI9yXbQQ1hz6dETcPhhV1P28HYyfqSQ5eWcdjn4rFVLEmKAbQcYbkvDDvFE3fKpayBDIYsrPT5toBzmiT85mKRN8bULjp1KZqa7fXmSHMo4HICFe7lTfxLak4xc8jGIVqkelgyV8avHOuA5i8N4M95Zya/GxOPvrCLCDxjkUQBGMieJquJK8gqhPTjQa/W8odWiJE0WDmamRQJo8co3YkUa3b0yArog2pstB0nKiF+50Hlo70/AKzUOLO28YXZaXW5eg==;31:GmT9JYM4qVEOGqGD1XBlFUlK/IqjSoB5i05pBHLRNbj/ksLJsfj61AUV0T47+kJTBNf1zXvUadoZ1SsBm5SRI7ZIVlOnV25Wjv9MN3vt8eoPAS1PIM+3xOrN0h+CVHqFQNa2wfKQRojrF4iotHPdfMH8Y9od5nJeXG+JrnyQy9LSuZEZuMSWQYaeAk8AWaFn/y04+N4r/byaiHdgACdiGZrSEML+9G9NXbLaqpEZquA= X-MS-TrafficTypeDiagnostic: HE1PR08MB2827: X-Microsoft-Exchange-Diagnostics: 1;HE1PR08MB2827;20:r+sKWUSlpk8bYzdY+cudlMqy15G4i8ThDr4zQu48WUpm1mT7ZleCrWrOz/Stwxhh6QAM1JmgiQV9xRrEDeRs4zKTDwfkWZE27I0LNaz10VzC6Rha7pdIP0OhtPGLpVij5lEyp/WjeEnmOKSdxtBD87w4cagD0hJpuHfXZXQXldvlRFcPRlhFCVnWtsQ5IS9EY6jlDcZ+7CgMsKHESbiDDhebos11jWD+0aRbUCgUdkXaO0dke/tCcqGSYvY93FTn4TbNzXPRwAwrHIZaziFagIR7vb7XcxqJamTrHjzFcVt5trk6jmcGQyBhJQ776J4n9CiZ+f2NRwm+tTSkZGuNsbraHHTXdJGH+dO/iNX6+PhRYT9ks2JtJzwBWBLptqvR35SEHsX0EIlIi479L5CA9sBpeh9dX47SNW1cW0z0HdE=;4:Fuqqp3a/69og8qWW0LfurrzM6iaYcSh1D6/ni3g4xaiy3w7R5//y4VuiFrL1Rab8khc8iHEwJsVUGFD4E8lzVAjP6Kv4HM+Co4jNTN3tVBXUTlswNgLx2a/XT5YeunRJKMCgKB6FP9z6fmcVbK0P+Ysx/iqvLpZhDzoQZxKROsRbQ+2K7Vo/oKIyeXEAaMMd8LtbSqg75j3wXP8/zr0wAxwdIoc7TR+mlcS4y1UxdnIioABs+PcPXkoVDU/QCzDG X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6041248)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:HE1PR08MB2827;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:HE1PR08MB2827; X-Forefront-PRVS: 04359FAD81 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(7370300001)(4630300001)(6009001)(6069001)(346002)(376002)(39830400002)(189002)(199003)(50226002)(6512007)(81166006)(8676002)(6666003)(81156014)(7736002)(478600001)(16526017)(33646002)(6116002)(69596002)(97736004)(86362001)(6916009)(1076002)(575784001)(189998001)(76506005)(68736007)(16586007)(316002)(47776003)(54906002)(106356001)(48376002)(7350300001)(105586002)(2906002)(5003940100001)(4326008)(36756003)(66066001)(5660300001)(305945005)(101416001)(6506006)(50466002)(3846002)(25786009)(107886003)(53416004)(50986999)(53936002)(6486002);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR08MB2827;H:localhost.sw.ru;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR08MB2827;23:dN+jNCRJdwMJW/fmluc5CpDwDRJdB8hHfujCGTwC2?= =?us-ascii?Q?uk4C41V+zgRC3CFENi24rDy1Bz9xA6RvZiocHkmpAuCqL0BkmzZ42oydeo0Q?= =?us-ascii?Q?Cz6rHp9JQkYAHB79wMhC6Y56a0SwB6Njs4/vSKF0MfBZJ+aXc955mHBznaca?= =?us-ascii?Q?f7uzzuKBPrR+QwDOx+gbt/np0kLXEosh2yfUbl1vHCVSmhlqLN1tzY9RPzG0?= =?us-ascii?Q?N+LsHVDE6KeQoz4eGPZ+gy991gt3Gmbnc6tL06wJtR7vaPO/QW2F9zOw2mG6?= =?us-ascii?Q?lcbGwkZzNFqy1pVFB98wREFucNOtAj7ujyQzxs3ei0Ae0q87i6yPzuVN2hSg?= =?us-ascii?Q?W2Fe8SEbcHflSPlmhiDCtVCXkjVMPIMHN0QFXfN39gObE+A6ETNNe9uw5uCm?= =?us-ascii?Q?7wBzFi8N9FM9fISBJsm0PeMYDoV3t4GKLxNc9bkIOp0H7Ep+HOV6/EsqVqz9?= =?us-ascii?Q?vW9dcNXp8Xs/kb777BC/mGqTY8IoVWSpuRUWH3vs6HFjMUW/yelQ8AHijgn9?= =?us-ascii?Q?pH/Kxog6ihSnsGpf+qVO7v8lD4HYKQR1j+1T+RpP3/ZAA4Qg+3+MUk5Gr++Y?= =?us-ascii?Q?eYyuapiA1AGTQLHfDD7nWBCWk+1vix2cw29Ks+nKrlg5tu9ZTDYNG2klIZ5y?= =?us-ascii?Q?HRFeyYdcaVF03Q7BvAG8auTOnA/PY4tYXeSCzJO8/1WyrZAY2gDoj6bc/MGU?= =?us-ascii?Q?WotVY7yYebrGId1UiFUI56B+ibjkKOL+YvERpsxsCephRgzkeFcCxyjSp/nF?= =?us-ascii?Q?wMlc1uLspHTZqJaSQ5uf0JP4Mu2lf5iG9BlJvty5ooiXxq+7f1SCeUtYY08m?= =?us-ascii?Q?PaFHWpOEYUABhyvt1v/wNhqNiXG0ueCzMxwZ8ZPophj9IbV/HwsKuR93mmcH?= =?us-ascii?Q?H0IEEeYdWfQmaEDBfdljW7nhRMwolxGWrOv81fR7crGnCSGBxLrSgM0lCwNa?= =?us-ascii?Q?YoAJltcQDxFF8sphBuX+7rqetZvu+JGCwuMvJ22f3tXVYEX+AWAy9SapvoYR?= =?us-ascii?Q?CQ0ya7WLUOpD09r/eV010fI+S2/aA/ak3wz4Y9JqS06V47oVW3NGPwMJ4mnp?= =?us-ascii?Q?rmGX7xpaMYM79GTCaI7i6/9k2mBTBTBYmQFPdQl9ePKVAgXDJ3v5S9YWClVV?= =?us-ascii?Q?SxmVBQQSYsBFHmxZBRsHoGkQ++7mQxcLJl0tneSl39YTv57NfqaYi3RgG+ar?= =?us-ascii?Q?vbXiGwjPc3M3vrWQn+6P0Hrn74rKUDaKWBEoopUMj59CI9fhtR7gmTBA0soA?= =?us-ascii?Q?OEIF1VKfOm7Pv9cc2kavH9HhoVKnJZr/pXsNwz0?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR08MB2827;6:KBoWSLRinCPRa0mzKJUzj5Ef4mDwAFMF9JlTH//wom3S7BIrE7NFYFh0YPaZrFIt00nKB8kkPx9VQbRk970HcTV4NsxFBBRulhe/l6GWhwsy5b9YNnw8Sd1scdxIuyqp238wN9mwru/SA0l9UXhChOpezUlaDKpNnps/HcPnXYS5lY8A721sSz/I/3qBQ2MzXBpdEJYCylXjwtlX751v9DOwodx+sPH/3TKucX3FHi5wljLy9Fvh99YQGh1bxWfgx6sDAhRIDmQg1NMn76jarRcrqmWB9hMt3JM9eg17q0qVj2FRE2/IwQbB1q8gN7B4L0WdLRzJCcRptxooWmiY4g==;5:81yGOAyjCgHIJXI8mZV/PA75Da2UfZDR1UdmfO1tCN7RS64jSHqIWWJf3dAWTD/CeJLlYClw9miKJMKsW2mTRaOTZMIjZygSeZzGZen6aFax9DO67MTqn/WiUCMJmpmaAdvrcypOCDxRewfp/J2HDA==;24:NClnGjD/rY7ffGxF7yg9b238Y4iqOrqihs/7xKOMApwWx5UcenZFlo9znrsbBQXSApG2cnX/kqxmaVaKIaAJNiqNjYJPBddKNGVPLLD0F0o=;7:g7jQ+XWRrd1XnUy1eG4mm3M+6vbududwrOcqt6q5zdBpoI2S9A4uwnWYgvzRbxYoxMRkGgbtXKjvSV1Cz5dM+T9EhFpdQb7oLn9Vpc725PvOOwVQlpjHk1w5HN+kCmKhFX8eqcwtU18io5eq7L/b4J5qLMN7vYjPm6eaOq8E/mf3y6gmzsz5eVSsKxlFjOfSla9BVM58RctWmcVL3JVa3bPziisDetkIV5q8LTOKZ5o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;HE1PR08MB2827;20:Wd3MtVLEDRMlTWLIPSZZeAm1EoZ7Y5cAeyn5YbYTDGhGIVgPAeX29jDbgW5qjdZj8L2wFReWvnqQKaAoumIaQHpK1fn9su7rvjVv1Os7jcJ63ztoGixlam+a2SLy2wHLoLeQy5kv8oU1cBKRGhjBaRMEmfrecw65ytYAajMF78M= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2017 12:44:09.7705 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB2827 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no need to surround kaslr_offset() with CONFIG_RANDOMIZE_BASE ifdef. kaslr_offset() will just return 0 if CONFIG_RANDOMIZE_BASE isn't set. Signed-off-by: Andrey Ryabinin --- kernel/kcov.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/kcov.c b/kernel/kcov.c index 3f693a0f6f3e..2f0e7a7c7afc 100644 --- a/kernel/kcov.c +++ b/kernel/kcov.c @@ -69,9 +69,7 @@ void notrace __sanitizer_cov_trace_pc(void) unsigned long pos; unsigned long ip = _RET_IP_; -#ifdef CONFIG_RANDOMIZE_BASE ip -= kaslr_offset(); -#endif /* * There is some code that runs in interrupts but for which -- 2.13.5