From patchwork Wed Jan 11 11:41:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Natalia Petrova X-Patchwork-Id: 41926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3270446wrt; Wed, 11 Jan 2023 03:44:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXt2SJcuLXIGDHoZwChApoZ49ABil37hUd0VgPCCIyJUEAiHzPZgvcPRE4hjnpMUslTvlP1I X-Received: by 2002:a17:902:f702:b0:192:e555:28e1 with SMTP id h2-20020a170902f70200b00192e55528e1mr27054668plo.8.1673437483260; Wed, 11 Jan 2023 03:44:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673437483; cv=none; d=google.com; s=arc-20160816; b=qjHVmK29SkeyF21uGnu4eqiKvcDZRZCXf4XavRv6WygDQk2pqaClIrHf0uSM1Wkapw QtV5yhh+yQtKXg7vl1vcItqZ/PhXJs0OwiAf56BtyYTR8aG1Ui1TkDAmQ5HfThoQVYuT eMRNS3rGWxSdY0qHJQAfpCW4opxoKjbIwt2d2BU7n9EMMJg4mvH7m8DuOSxbBwTQTznO Jb5UWpH5WjbEknOEc1pGCul0kbxB2L9hAwMKy2qc1D09zHHMFDstmKPu7jfb8hAOoTbT VHmcdg+nT+ZrrlEgd1Byv3Y7D9oK5vX9BS9MQOts4+Leiyis+zrOAZ9xPKg/fTSZbeB9 pdMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=qWEp68BaQ4tiwEzntQ/EKk1PFF5xs3d/gJEBTNIwaE4=; b=U/Ybrl0/D0xDvQ3qEzKgO+aqGiS1rotazg7JR4ydYo7QJ+fb8VSg8euuZiN52eYJTw rRdRMXqfTVk0hE1/xnsa4w5rT49V9W0fLnikdXtOOqM81Qt3I6wsj+aK4F5SwJey0x8Z tSB9Z6kupT/sNuQ/xVedrLuxuTy1pG8D7wjXD/G72IEY6W6pHR5uY2QeEA2v1Xv23/Ws cSw/YW9ntZ0s9zaj0f81wDl9+4a4PgRoppGdYZeQOtZ2DXYsyyqSJqJGtogDPWYgLMho FdNKcPFu2q7ULe+QbKamWOSg5lSMzsSxu6evB0F90+fM7fyIZ3PSOFguIf9oHhWP+i3P E62Q== 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 d4-20020a170902854400b0018c91adca12si13173219plo.529.2023.01.11.03.44.30; Wed, 11 Jan 2023 03:44:43 -0800 (PST) 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 S232271AbjAKLoF (ORCPT + 99 others); Wed, 11 Jan 2023 06:44:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238586AbjAKLni (ORCPT ); Wed, 11 Jan 2023 06:43:38 -0500 X-Greylist: delayed 66 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 11 Jan 2023 03:42:36 PST Received: from exchange.fintech.ru (e10edge.fintech.ru [195.54.195.159]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED271110D for ; Wed, 11 Jan 2023 03:42:36 -0800 (PST) Received: from Ex16-01.fintech.ru (10.0.10.18) by exchange.fintech.ru (195.54.195.169) with Microsoft SMTP Server (TLS) id 14.3.498.0; Wed, 11 Jan 2023 14:41:21 +0300 Received: from KANASHIN1.fintech.ru (10.0.253.125) by Ex16-01.fintech.ru (10.0.10.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Wed, 11 Jan 2023 14:41:21 +0300 From: Natalia Petrova To: Steven Rostedt CC: Natalia Petrova , Ingo Molnar , , Subject: Date: Wed, 11 Jan 2023 14:41:18 +0300 Message-ID: <20230111114118.3796-1-n.petrova@fintech.ru> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.0.253.125] X-ClientProxiedBy: Ex16-01.fintech.ru (10.0.10.18) To Ex16-01.fintech.ru (10.0.10.18) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1754726382356476868?= X-GMAIL-MSGID: =?utf-8?q?1754726382356476868?= Date: Thu, 15 Dec 2022 18:08:36 +0300 Subject: [PATCH] trace_events_hist: add check for return value of 'create_hist_field' Function 'create_hist_field' is called recursively at trace_events_hist.c:1954 and can return NULL-value that's why we have to check it to avoid null pointer dereference. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 30350d65ac56 ("tracing: Add variable support to hist triggers") Signed-off-by: Natalia Petrova --- kernel/trace/trace_events_hist.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index fdf784620c28..9c8c1614a78e 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1952,6 +1952,8 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data, hist_field->fn = flags & HIST_FIELD_FL_LOG2 ? hist_field_log2 : hist_field_bucket; hist_field->operands[0] = create_hist_field(hist_data, field, fl, NULL); + if (!hist_field->operands[0]) + goto free; hist_field->size = hist_field->operands[0]->size; hist_field->type = kstrdup_const(hist_field->operands[0]->type, GFP_KERNEL); if (!hist_field->type)