Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp635351pxb; Thu, 12 Nov 2020 12:18:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJwc+95q9BPfDePk/lhMpIako/ojTEyylJ/1aHQTKKef8VtqQ7jq9+I9Yc6gzLd2IuvAd1+j X-Received: by 2002:a05:6402:142f:: with SMTP id c15mr1773340edx.33.1605212320600; Thu, 12 Nov 2020 12:18:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605212320; cv=none; d=google.com; s=arc-20160816; b=SA4+OeeUPlBGJhpJEFUyRy53MJaMl5GYlKjFb85Kl7jDSKvzYyumlLfVEKGh88u45F YNWyqs0KUYgJqy1iVAHJHUr1KMHtPoS8zSSye+UYCPVUv2vHJpwZ5YxB+qx19btbrOtu mZr9xomcIq8SXdiQUzcAtYmqGIUM9+dtKcA+/QFGDfNzakqcPGEasPVJBapNTU5b87Gm hQk6G9LvBNsfjqK2N8AhCsqvEi8giTmfXfDpGwGnylBG++0/P+RBgTvuO5Dq+9BZSRif cINUGwjyi8/E/CqFDlkncxyD3FlNawuY7WPFL+tmY5NkJYeBvzxhEfceMdQeo6aj6kdO KMJg== 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:dkim-signature; bh=XZYq8cp4t+RfHutn8gXRsF49P6t4k2nOwingyR/mgRc=; b=q5lHg4Mmf7rYd/CsUVDgeMrr+g56PJvGz54Sw2lF8xfqrJTVyGv55dJzzHfI8tJVFd X5MCvYJ+4GhXX2F/hElktdDhA3JLBOGG8zpjaVBF2MDYUJs0fxPY3kEi6EFE+RjbEzbm 0b/nnxTuiCA/q+Og2rqN1NgnjxaUGk818LBar7AOD23o7LkVes3Y9ewvaZsT0qsIV1gr V0j0AgBn0ekqGdGhiGYfBLe+KJNbPnVJWAAwknTmykZWbHm5Tm4u0dkq29WL1CqPLHpI 5rNKoN0EyV3I10k9PuXXKXB/jwYHqp69oWS13g3EDdRiPOjWSX9sd1H5rYtWCe8DF739 DMJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=H6adjQ+O; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a42si6223105edf.535.2020.11.12.12.18.09; Thu, 12 Nov 2020 12:18:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-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=@redhat.com header.s=mimecast20190719 header.b=H6adjQ+O; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727025AbgKLURi (ORCPT + 99 others); Thu, 12 Nov 2020 15:17:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38164 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727000AbgKLURi (ORCPT ); Thu, 12 Nov 2020 15:17:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605212257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XZYq8cp4t+RfHutn8gXRsF49P6t4k2nOwingyR/mgRc=; b=H6adjQ+O/nAsQIi7Sp2pmOUOwARQNuTt0wRDKoOCUZdzS3LviUW775SREfN6xTKUUm/DV5 hMe6qiWgHK4RxcnkDaEwRpzSAmEWRDqRMRLOORXIJ6y8y+l0GUv0R+G1sU+Fki+Eyhkx5v md1qvpgxemjAMtP0dfIchXub2BEle1o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-475-lgGfxALAMBmM6cZEUcxaXA-1; Thu, 12 Nov 2020 15:17:35 -0500 X-MC-Unique: lgGfxALAMBmM6cZEUcxaXA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2795A1006C89; Thu, 12 Nov 2020 20:17:34 +0000 (UTC) Received: from aion.usersys.redhat.com (ovpn-113-97.rdu2.redhat.com [10.10.113.97]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0735D6EF6E; Thu, 12 Nov 2020 20:17:33 +0000 (UTC) Received: by aion.usersys.redhat.com (Postfix, from userid 1000) id D4CA81A0018; Thu, 12 Nov 2020 15:17:32 -0500 (EST) From: Scott Mayhew To: chuck.lever@oracle.com, bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH] SUNRPC: Fix oops in the rpc_xdr_buf event class Date: Thu, 12 Nov 2020 15:17:32 -0500 Message-Id: <20201112201732.1689680-1-smayhew@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Backchannel rpc tasks don't have task->tk_client set, so it's necessary to check it for NULL before dereferencing. Fixes: c509f15a5801 ("SUNRPC: Split the xdr_buf event class") Signed-off-by: Scott Mayhew --- include/trace/events/sunrpc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 2477014e3fa6..2a03263b5f9d 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -68,7 +68,8 @@ DECLARE_EVENT_CLASS(rpc_xdr_buf_class, TP_fast_assign( __entry->task_id = task->tk_pid; - __entry->client_id = task->tk_client->cl_clid; + __entry->client_id = task->tk_client ? + task->tk_client->cl_clid : -1; __entry->head_base = xdr->head[0].iov_base; __entry->head_len = xdr->head[0].iov_len; __entry->tail_base = xdr->tail[0].iov_base; -- 2.25.4