Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp6474278pxb; Wed, 17 Feb 2021 05:40:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJx37rlUajRuaPXpiNHbIcdUOr4GNzIkAtqP/aCqHOznsGyeV151pupNh/HNm+KV7nltvzvn X-Received: by 2002:aa7:c044:: with SMTP id k4mr12153972edo.47.1613569205305; Wed, 17 Feb 2021 05:40:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613569205; cv=none; d=google.com; s=arc-20160816; b=nWL/0nalTCbfYJ3MEI+yk8xyODDtX5TzUOJdQIkNxX3uXD9+hCqSL6UdyRgaFOTAXS RaODWO9DAr6uYQV7+HoWGwO6a/37E+Q5VoiX1t7Y2LPGZtIH1/Ehm45iAygqmIlL+r9b gej20k8FTRooXk6P7T3kXdYhnEn1YsV1wTU+hDjHDIUCxGcdcr5d4XMbyZ2sEe3uYxm/ jG18MSt6fC0iDkBqNbsgCVlyb9zSmLyoDxMZnnY1zSMV78PbMRq6dkaUv7IrcgiAjIxs 9l7rx+2Bt4JElJKB4TccFYMSlnxLjRpeG50CBSjVMberAEQI8p8+xm8QGed2hHRH5pdY PprA== 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=cVgRQYlEdu4uIrNR3Ev/07QNnlxfA0x2Ch+WTOVJHA0=; b=nrII8iWwP/RitXX4sCBjHphaF28TMmlzqs0F+LzTPJEG2CveVsqw6yDCCq25lyrnqu XIYiphtkqqGi9Pussp2W7NmWetNpV5qfD/P4tc/OxSNP0Md9RkuFfoCd9eZNxPc9l89B PMe78Ah5T8C4myl2TZhljUeAGFBa1x6B5CiM3U5q4Mwp5dg2ThfMpcqNkS73LJr3E/H+ EiwOceSrYW5H7n0ePAmBauhViM2umANSSoE5Wlnm3haegv/xlKQxcYIzjw7scJh/gNN0 AW5CI2Gq7XsQxEo+88+f7Nq7GsqVAxI5Qj17V/SeSNQq1K/aR8wyifkP7kaa7FFDrbi3 ug3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0X5U807K; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=V2TmbvuO; 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 dt22si1376098ejc.522.2021.02.17.05.39.42; Wed, 17 Feb 2021 05:40:05 -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=0X5U807K; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=V2TmbvuO; 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 S232956AbhBQN0m (ORCPT + 99 others); Wed, 17 Feb 2021 08:26:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232890AbhBQNSz (ORCPT ); Wed, 17 Feb 2021 08:18:55 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26D14C06178B; Wed, 17 Feb 2021 05:17:35 -0800 (PST) Date: Wed, 17 Feb 2021 13:17:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1613567853; 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=cVgRQYlEdu4uIrNR3Ev/07QNnlxfA0x2Ch+WTOVJHA0=; b=0X5U807K+aAXoehSjfunWehqmgDvMgL0p51ZuumwYHPfqh3q7BDPywFb4TeJWJGA6GVDX3 OPcTSXkMqTOkMlD3ggMuTrzdMQffvSups7q6w9lkySwZawxE2z6LiKhAyFcEESmpSnpovQ VkoWqyk6JCgiiZwFSLWSHu64eqJLhZ6eTo1aP5GXTW7ds4LB5EdUyAbIy3D3PJ0QOua2AQ ovXVC4MXSBo9wSVARIud9GgZFWjVUgrBtLpUlXDMtxbJUb1zLcud4LPrXkktWH5phCaSd2 fhikk4HRUJEENWTlvFwi83Hikk9KDwsDkf31fJ+56fkEBLAQU4G6/4h2VQ08Bw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1613567853; 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=cVgRQYlEdu4uIrNR3Ev/07QNnlxfA0x2Ch+WTOVJHA0=; b=V2TmbvuOJYapzFiymkM1GgLSWCdBSPwvlljvCvuVBToqrnNOAFECx8KVMBOITLCv15FYgO vIe/y5xkGAGi2pCg== 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)" , Ingo Molnar , 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: <161356785277.20312.6136035568546134813.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: b0d6d4789677d128b1933af023083054f0973574 Gitweb: https://git.kernel.org/tip/b0d6d4789677d128b1933af023083054f0973574 Author: Sven Schnelle AuthorDate: Tue, 09 Feb 2021 16:07:11 +01:00 Committer: Ingo Molnar CommitterDate: Wed, 17 Feb 2021 14:12:42 +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) Signed-off-by: Ingo Molnar 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; }