Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752743AbbGNDvS (ORCPT ); Mon, 13 Jul 2015 23:51:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57949 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752063AbbGNDvQ (ORCPT ); Mon, 13 Jul 2015 23:51:16 -0400 Date: Mon, 13 Jul 2015 22:51:15 -0500 From: Josh Poimboeuf To: Minfei Huang Cc: sjenning@redhat.com, jkosina@suse.cz, vojtech@suse.cz, live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Minfei Huang Subject: Re: [PATCH] livepatch: klp_disable_func returnes once it does not satisfy the condition Message-ID: <20150714035115.GC25198@treble.redhat.com> References: <1436843737-17773-1-git-send-email-mhuang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1436843737-17773-1-git-send-email-mhuang@redhat.com> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1303 Lines: 38 On Tue, Jul 14, 2015 at 11:15:37AM +0800, Minfei Huang wrote: > From: Minfei Huang > > It is more better that klp_disable_func returnes immediately, if > func->state and func->old_addr do not satisfy the condition. > > We should robust the livepatch code, although the above situation never > happen in current code path. > > Signed-off-by: Minfei Huang > --- > kernel/livepatch/core.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c > index c40ebcc..6e53441 100644 > --- a/kernel/livepatch/core.c > +++ b/kernel/livepatch/core.c > @@ -348,8 +348,10 @@ static void klp_disable_func(struct klp_func *func) > { > struct klp_ops *ops; > > - WARN_ON(func->state != KLP_ENABLED); > - WARN_ON(!func->old_addr); > + if (WARN_ON(func->state != KLP_ENABLED)) > + return; > + if (WARN_ON(!func->old_addr)) > + return; > > ops = klp_find_ops(func->old_addr); > if (WARN_ON(!ops)) Acked-by: Josh Poimboeuf -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/