Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755275AbdLTNIT (ORCPT ); Wed, 20 Dec 2017 08:08:19 -0500 Received: from mx2.suse.de ([195.135.220.15]:51128 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754310AbdLTNIS (ORCPT ); Wed, 20 Dec 2017 08:08:18 -0500 Date: Wed, 20 Dec 2017 14:08:16 +0100 From: Petr Mladek To: Miroslav Benes Cc: jpoimboe@redhat.com, jeyu@kernel.org, jikos@kernel.org, jbaron@akamai.com, live-patching@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] livepatch: add locking to force and signal functions Message-ID: <20171220130816.wpqscs3f3hmmnrt2@pathway.suse.cz> References: <20171220092807.27785-1-mbenes@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171220092807.27785-1-mbenes@suse.cz> User-Agent: NeoMutt/20170421 (1.8.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1871 Lines: 56 On Wed 2017-12-20 10:28:07, Miroslav Benes wrote: > klp_send_signals() and klp_force_transition() do not acquire klp_mutex, > because it seemed to be superfluous. A potential race in > klp_send_signals() was harmless and there was nothing in > klp_force_transition() which needed to be synchronized. That changed > with the addition of klp_forced variable during the review process. > > There is a small window now, when klp_complete_transition() does not see > klp_forced set to true while all tasks have been already transitioned to > the target state. module_put() is called and the module can be removed. > > Acquire klp_mutex to prevent it. Do the same in klp_send_signals() just > to be sure. There is no real downside to that. > > Reported-by: Jason Baron > Signed-off-by: Miroslav Benes > --- > kernel/livepatch/transition.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c > index be5bfa533ee8..3f932ff607cd 100644 > --- a/kernel/livepatch/transition.c > +++ b/kernel/livepatch/transition.c > @@ -625,6 +625,8 @@ void klp_send_signals(void) > > pr_notice("signaling remaining tasks\n"); > > + mutex_lock(&klp_mutex); > + > read_lock(&tasklist_lock); > for_each_process_thread(g, task) { > if (!klp_patch_pending(task)) > @@ -653,6 +655,8 @@ void klp_send_signals(void) > } > } > read_unlock(&tasklist_lock); > + > + mutex_unlock(&klp_mutex); It would be cleaner if the lock guarded also the check: if (patch != klp_transition_patch) return -EINVAL; in signal_store(). Then we could remove also the comment above this check. Same is true also for the force part stuff. Best Regards, Petr PS: I am sorry that I hand waved the proposed solution when we spoke about it yeasterday. I should have looked into the code.