From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZqJY0UuXkVBgltt+77yJ4ZnEnHKdUWeYAsGgU78SGdO5tEHF6OlS8m5/7HwrmS1+RViWmyK ARC-Seal: i=1; a=rsa-sha256; t=1525767101; cv=none; d=google.com; s=arc-20160816; b=UjOYH2shmpvN+llNbpl9w4b3ivH4bWWkiLJxzWkGGSqV0HkJFuMrkuTxHsUkjGr1kV 419xFccBtRZVcUUco3uSomdC2OTDbmuxvNz/XZJ6kgGJmvIFM5THWOFQU4O4ecXjaJB3 nnpVnRpdJwLBVM+lu1K2Pgy5sPwUBEOXhQIqDsAN2vQ4QebUgVxIzrOEmbrGIAITQvQL qsuPmVjWGQpCVk5dLueBZ8bmQzk2a3fyczjGNcyDYcvMjCdT9MygYF9jTcXQtxrF9fiB EasZXfOlbH+ajsuKEphNPcf+WwwPcaVWHgNWjW5Fip1EDLAkL38ibRNAKkzI9rXEz6cr igfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=tzNxe/PGAWuvni1irATmMN61Z5xQh6PAKRe007dkuZg=; b=TDYzu1+HJuAy/O+2b4+1MormXyg6dm/Ksye36GFBnpztQhdai801GT34LPlq4Mp/pN 9p75C63O/COgTtJmt2VM8qiMBTQOw5HugtWXoUUwoqEhtMPAhNeL4aGqyBf1Op0aJJG/ MwzXOGILnSEPhV4yIA0f9WgEyK94ebcvvnp+Uuvao6zk26TnTXn2pABm/BZODsjM6wOt f+4bxCgeXAGjLCHSnSccOGLO46deBIXgBIKMOrQDN54LcFw4GYdmc2K0h/iJ069WscxD +fJvHD/v4rwsX0F1a3qGYuCWrxW2ZEkIfsu6HIhq12XQIYWGuTRZN9CwxKUCKOD1KN7q 1Avw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aI9toV+/; spf=pass (google.com: domain of srs0=4in3=h3=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=4In3=H3=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aI9toV+/; spf=pass (google.com: domain of srs0=4in3=h3=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=4In3=H3=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Zijlstra , Jiri Olsa , Arnaldo Carvalho de Melo , Alexander Shishkin , Namhyung Kim , syzbot+9c0d616860575a73166a@syzkaller.appspotmail.com, syzbot+4e9ae7fa46233396f64d@syzkaller.appspotmail.com, Mathieu Desnoyers , "Steven Rostedt (VMware)" Subject: [PATCH 4.16 10/52] tracepoint: Do not warn on ENOMEM Date: Tue, 8 May 2018 10:10:08 +0200 Message-Id: <20180508073929.363979577@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508073928.058320984@linuxfoundation.org> References: <20180508073928.058320984@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1599882764347607574?= X-GMAIL-MSGID: =?utf-8?q?1599882764347607574?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mathieu Desnoyers commit d66a270be3310d7aa132fec0cea77d3d32a0ff75 upstream. Tracepoint should only warn when a kernel API user does not respect the required preconditions (e.g. same tracepoint enabled twice, or called to remove a tracepoint that does not exist). Silence warning in out-of-memory conditions, given that the error is returned to the caller. This ensures that out-of-memory error-injection testing does not trigger warnings in tracepoint.c, which were seen by syzbot. Link: https://lkml.kernel.org/r/001a114465e241a8720567419a72@google.com Link: https://lkml.kernel.org/r/001a1140e0de15fc910567464190@google.com Link: http://lkml.kernel.org/r/20180315124424.32319-1-mathieu.desnoyers@efficios.com CC: Peter Zijlstra CC: Jiri Olsa CC: Arnaldo Carvalho de Melo CC: Alexander Shishkin CC: Namhyung Kim CC: stable@vger.kernel.org Fixes: de7b2973903c6 ("tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints") Reported-by: syzbot+9c0d616860575a73166a@syzkaller.appspotmail.com Reported-by: syzbot+4e9ae7fa46233396f64d@syzkaller.appspotmail.com Signed-off-by: Mathieu Desnoyers Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/tracepoint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c @@ -207,7 +207,7 @@ static int tracepoint_add_func(struct tr lockdep_is_held(&tracepoints_mutex)); old = func_add(&tp_funcs, func, prio); if (IS_ERR(old)) { - WARN_ON_ONCE(1); + WARN_ON_ONCE(PTR_ERR(old) != -ENOMEM); return PTR_ERR(old); } @@ -239,7 +239,7 @@ static int tracepoint_remove_func(struct lockdep_is_held(&tracepoints_mutex)); old = func_remove(&tp_funcs, func); if (IS_ERR(old)) { - WARN_ON_ONCE(1); + WARN_ON_ONCE(PTR_ERR(old) != -ENOMEM); return PTR_ERR(old); }