Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1393906ybi; Fri, 14 Jun 2019 14:04:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqxqrvRg7yNZP9DyRoH2uVU/0VQSbmU2QKFcudcTqI0zfCYQjR5T/neOM/hvPY1PpGUxIqfj X-Received: by 2002:a63:f953:: with SMTP id q19mr34935366pgk.367.1560546271965; Fri, 14 Jun 2019 14:04:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560546271; cv=none; d=google.com; s=arc-20160816; b=LyeEdWmexXdptUcI8Ytbriq/srKsaEfu35qBGEAh0yVoQtE3hjcg+ZyD8LnxPC8Rq0 Wfgh80u0gws4ev6gB+XEDJIDpK1YbpG4jmWGwK1Y04Zj0/cGaDQjThRLJyeAkDLHZq+x 8j5R0IQ6CZQmysIX6jAqLObAEKgNVAlAo5yDZxrcVLo6Plmrk7EEZ/MgFmgeWYmJNfL4 h7zGLqgjUk6r0nZCh4NRjPJ/qQ5i430ZIQ3JhRTlNf5P5plPkdSlwVD/38CF3Ox5Qkhn Fuo0NrBa1YUZgPp2gVWM1IHSdthmhN09GCpJ2iYsR/kN2EbB2mLBdKO+4dBf1q5KxR5X rwyw== 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 :references:in-reply-to:message-id:subject:cc:to:from:date; bh=iknbioM7p3W3L3py2IxF8AopW7jDv+NyPMeBQhFijx4=; b=WdDDETYFHuaCgaYQ0QY0hnr4nfdHgb94zvAi4jjx2CjMrz3+3vINoWtAd8xtU2jcHN C5fEgc8yb4s5rJbsnkjEKfcXLbhJ4gzi51XsvfXitqw3FKoAjhmtDzGjjMIWdjCGdWt6 TrboGaoDNdgHfquBm4S3sK6SYGYajU3exkrlf7O1FSZTM01OMXbCOqmzR2EosLQdVQ11 fInEdIeuixP2bAn2SIlS6jLFJYq/bI1wVofUYtPvOFKt8sXoL5WGr8+UDguxoTMIT+Y1 0DgKfUp3NOACa+D+9m/vw2NuaomIpS29egIUgRl2ODssRViwewRPYxWqDBpEE2ld6uXC nwTA== ARC-Authentication-Results: i=1; mx.google.com; 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 a22si3492123pgb.292.2019.06.14.14.04.16; Fri, 14 Jun 2019 14:04:31 -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; 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 S1726140AbfFNVEM (ORCPT + 99 others); Fri, 14 Jun 2019 17:04:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:53110 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725808AbfFNVEL (ORCPT ); Fri, 14 Jun 2019 17:04:11 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (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 EFE8F217F9; Fri, 14 Jun 2019 21:04:09 +0000 (UTC) Date: Fri, 14 Jun 2019 17:04:08 -0400 From: Steven Rostedt To: Josh Poimboeuf Cc: Jessica Yu , Petr Mladek , Jiri Kosina , Miroslav Benes , Joe Lawrence , linux-kernel@vger.kernel.org, live-patching@vger.kernel.org, Johannes Erdfelt , Ingo Molnar Subject: Re: [PATCH 1/3] module: Fix livepatch/ftrace module text permissions race Message-ID: <20190614170408.1b1162dc@gandalf.local.home> In-Reply-To: References: X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 13 Jun 2019 20:07:22 -0500 Josh Poimboeuf wrote: > It's possible for livepatch and ftrace to be toggling a module's text > permissions at the same time, resulting in the following panic: > [..] > The above panic occurs when loading two modules at the same time with > ftrace enabled, where at least one of the modules is a livepatch module: > > CPU0 CPU1 > klp_enable_patch() > klp_init_object_loaded() > module_disable_ro() > ftrace_module_enable() > ftrace_arch_code_modify_post_process() > set_all_modules_text_ro() > klp_write_object_relocations() > apply_relocate_add() > *patches read-only code* - BOOM > > A similar race exists when toggling ftrace while loading a livepatch > module. > > Fix it by ensuring that the livepatch and ftrace code patching > operations -- and their respective permissions changes -- are protected > by the text_mutex. > > Reported-by: Johannes Erdfelt > Fixes: 444d13ff10fb ("modules: add ro_after_init support") > Signed-off-by: Josh Poimboeuf > Acked-by: Jessica Yu > Reviewed-by: Petr Mladek > Reviewed-by: Miroslav Benes This patch looks uncontroversial. I'm going to pull this one in and start testing it. And if it works, I'll push to Linus. -- Steve