From patchwork Sat Nov 5 20:50:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 16016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1166829wru; Sat, 5 Nov 2022 13:52:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM68TIAoZPDLQpSV80huztjBBEdvifQuOzcV/XAFDYL7DmZtSVVeqm8nON8PueCEtInmkxwS X-Received: by 2002:a17:90b:4f4c:b0:216:cdf6:5c39 with SMTP id pj12-20020a17090b4f4c00b00216cdf65c39mr11584939pjb.237.1667681540856; Sat, 05 Nov 2022 13:52:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667681540; cv=none; d=google.com; s=arc-20160816; b=FLgxnVAZAl9LHioINOlUi9xfJDcX2Sum5Djz9R7FEVe/XtDWIAyvvCoEzJk/OzGVKZ UT900hZQPyjzoz6bfVsil0bhIprX/VI3LIRifTrlUWB0gjsvKSDR9n/kipYxTE+KsUn0 y7wu2GqtG+Nf/kUuHo+xsutaaI0LgjfSipxcVU+usz8wPKJ/E73OcDX8TzRgBJM/7xDN o68Dm90ANovHfaq3p+os2Qja17nnw3AkpG+UO0QLMBZSCcxqlr5bV5riIKZH487Kbp2o Vko4LoGe1R3kdSc/btiRogG+4s2P2t08kaUKk9GhzO8ucTo/WbTcIlQpRzsnSVEITmvw 28Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=dCT7YvY5zwEGW6T6Nr2sRROqxPkEfJEgMXeTOyerPu8=; b=FBnxSeA+Cldzxr+XUNfM+f3meUHQeqLwhvv6nK5zEyWojEsPFMbhblWXTuax11WiyV esgR9Z4k2MOHFDn4w1CwYWBl0x07ExuoZIvaeD9M0wkjXmq2O2IK02iSq87E9PkN052x wwdMgud6DXIuU9Fdf7ze4BQ/0zqbZ/EKK1nqT8cCWZRIQDCIGGrH10Yq9fIr2RRYOu0e UTyDffUMHE3XBa8uMtdWTMDAdx3nJCF5yltROYGjI3MrArkq+g9D47bElehccusAZJzZ P+PkVEArejVzX7ogAy07HTO7AIIVWi+mMdHJBNWqU4qYH9xXSGqrarT+9/a+aHzfQfQb Mjog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z11-20020a170902d54b00b001769cc79508si4081384plf.291.2022.11.05.13.52.08; Sat, 05 Nov 2022 13:52:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229813AbiKEUvM (ORCPT + 99 others); Sat, 5 Nov 2022 16:51:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229533AbiKEUvK (ORCPT ); Sat, 5 Nov 2022 16:51:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B366EE2A; Sat, 5 Nov 2022 13:51:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8E7E860B83; Sat, 5 Nov 2022 20:51:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02C6BC43144; Sat, 5 Nov 2022 20:51:08 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orQ8g-007k8n-0C; Sat, 05 Nov 2022 16:51:38 -0400 Message-ID: <20221105205137.904415773@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 05 Nov 2022 16:50:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, Rafael Mendonca Subject: [for-linus][PATCH 4/6] fprobe: Check rethook_alloc() return in rethook initialization References: <20221105205049.462806482@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748690839302384982?= X-GMAIL-MSGID: =?utf-8?q?1748690839302384982?= From: Rafael Mendonca Check if fp->rethook succeeded to be allocated. Otherwise, if rethook_alloc() fails, then we end up dereferencing a NULL pointer in rethook_add_node(). Link: https://lore.kernel.org/all/20221025031209.954836-1-rafaelmendsr@gmail.com/ Fixes: 5b0ab78998e3 ("fprobe: Add exit_handler support") Cc: stable@vger.kernel.org Signed-off-by: Rafael Mendonca Acked-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/fprobe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index aac63ca9c3d1..71614b2a67ff 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -141,6 +141,8 @@ static int fprobe_init_rethook(struct fprobe *fp, int num) return -E2BIG; fp->rethook = rethook_alloc((void *)fp, fprobe_exit_handler); + if (!fp->rethook) + return -ENOMEM; for (i = 0; i < size; i++) { struct fprobe_rethook_node *node;