Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1323159pxb; Wed, 10 Feb 2021 06:00:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfaZQ1w4l5XwyeNQKTLB6kjOOkEwVHBRz9NAFFAmy1qL2Qad60rmCS+g3o0f8K+lQSeXq8 X-Received: by 2002:aa7:de82:: with SMTP id j2mr3231860edv.313.1612965656495; Wed, 10 Feb 2021 06:00:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612965656; cv=none; d=google.com; s=arc-20160816; b=nxs0SjnawKgvEpfdZXM5bH6ex8ZD069Z5rZtDTeH7kuhiDEDCy/Gkze9mrlXo/GLm7 7v26fQ7YG3YFcJ5flHqjTN44S1jfxMgYsmGmeIgXXhbWdJsUM6XHPjj+Wn9YAlUPP6sE HKFb7IBfvVIhvcxJXo5t2wZqOVlJWz1lfDqOgXaEW4fs0NAK2fEMv0o34oO5jOfRiPu2 AdrInHmVm1lz7Hr9sSTTn13/058o3recxDtnVVfYymglDKZ3Wh7Fzgf7DwT0BKqeHYdO Z1xh8MeavEtK+lDM/z4h/6M0cukq1rSWaubWlmyEDtmzSHr7VWTFex9Sz0DE8mU9ixgg v+Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=/qiOnCrpWgSV4zWzTwIRtHFBfKvrZcNgm6eKxfH11Hs=; b=DPtnRjomEqH2uG4Xt1T0cAD5i07Qjqd6QeVz8LrDzPdN5/jKG+y3os67m+YG35HEyf 6GmgJqP9ZznNj7S740zVpoL1714UtCjhrrN/qPBn+1v2W/bH42d1JysSmS6e4zFHAzwD Ar6wTelK3jcP6z0Gfm/P+dJIGRIAVvuShYfpg5TS2J9AyYfUymTW4OUv3OIq0CsZF/q5 0xjsekD8cAURyLlMqtgDnjskCAes3t88kxKf6KjnAAtlRaOCGEAiJQDBxgxvMQGayeXw PUIRbWZUq4rgxZtdz/p2gLDIm/r29zb8SDlv13Kt+hNSHRZBomawt7luSIY4uVDf7oai 3bHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=V98RPZKf; dkim=neutral (no key) header.i=@linutronix.de header.b=AFmz1C5D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s12si1404438edy.569.2021.02.10.06.00.31; Wed, 10 Feb 2021 06:00:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=V98RPZKf; dkim=neutral (no key) header.i=@linutronix.de header.b=AFmz1C5D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229789AbhBJN5o (ORCPT + 99 others); Wed, 10 Feb 2021 08:57:44 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:60062 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231546AbhBJNyT (ORCPT ); Wed, 10 Feb 2021 08:54:19 -0500 Date: Wed, 10 Feb 2021 13:53:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1612965214; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/qiOnCrpWgSV4zWzTwIRtHFBfKvrZcNgm6eKxfH11Hs=; b=V98RPZKftKl/nFipCEGty6uIm1YLRQv+D9FwfBZsv/VyoC3CoMmW1WAj86s68YTYdz87An g/K3gTl94kdbtnIHW8csHeJZjs8Q1r23FEH1b5utnFR4LxGoZ3nbvpjK71nKoEynOIFNKV GgwY16A26ugLB09WMxs/0r3EwxDPzWdQZBJx1Plgo0GM4RHJU1C20bxshhzI+cETRsV2Uj IbsifDW3GBExbrf/ePHBzNJxZbdCi/KFbrBs07RxJXr0DhFOId/Rx4ptBorB446E+Do/YP UQDZOAjUAm3OOsc9afP3+h4iYpHS7MIRHgmkkFjPD2dF70Fh6LHhrFsHiY8h5w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1612965214; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/qiOnCrpWgSV4zWzTwIRtHFBfKvrZcNgm6eKxfH11Hs=; b=AFmz1C5DzMdrLqWly6cgj9InvciKpJssxSA4zP4J/o0gtL7YcHLWKj0/qL9/Id0PzydvZi JxX7itrneTKIGGAg== From: "tip-bot2 for Sven Schnelle" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] uprobes: (Re)add missing get_uprobe() in __find_uprobe() Cc: Sven Schnelle , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210209150711.36778-1-svens@linux.ibm.com> References: <20210209150711.36778-1-svens@linux.ibm.com> MIME-Version: 1.0 Message-ID: <161296521396.23325.14276433329775454608.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: 2c3496a02cb06ffe957854d8488a5799d7bfb252 Gitweb: https://git.kernel.org/tip/2c3496a02cb06ffe957854d8488a5799d7bfb252 Author: Sven Schnelle AuthorDate: Tue, 09 Feb 2021 16:07:11 +01:00 Committer: Peter Zijlstra CommitterDate: Wed, 10 Feb 2021 14:44:48 +01:00 uprobes: (Re)add missing get_uprobe() in __find_uprobe() commit c6bc9bd06dff ("rbtree, uprobes: Use rbtree helpers") accidentally removed the refcount increase. Add it again. Fixes: c6bc9bd06dff ("rbtree, uprobes: Use rbtree helpers") Signed-off-by: Sven Schnelle Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20210209150711.36778-1-svens@linux.ibm.com --- kernel/events/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index fd5160d..3ea7f8f 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -661,7 +661,7 @@ static struct uprobe *__find_uprobe(struct inode *inode, loff_t offset) struct rb_node *node = rb_find(&key, &uprobes_tree, __uprobe_cmp_key); if (node) - return __node_2_uprobe(node); + return get_uprobe(__node_2_uprobe(node)); return NULL; }