From patchwork Wed Dec 26 03:18:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1018525 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="FkFoimry"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43PdVH2Q7vz9sCQ for ; Wed, 26 Dec 2018 14:19:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726593AbeLZDSx (ORCPT ); Tue, 25 Dec 2018 22:18:53 -0500 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:48094 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725913AbeLZDSx (ORCPT ); Tue, 25 Dec 2018 22:18:53 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 852765BB for ; Wed, 26 Dec 2018 03:18:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yngovxbl-hwp for ; Tue, 25 Dec 2018 21:18:51 -0600 (CST) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 56DC85BA for ; Tue, 25 Dec 2018 21:18:51 -0600 (CST) Received: by mail-io1-f70.google.com with SMTP id b8so2699966ion.5 for ; Tue, 25 Dec 2018 19:18:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=0a6iLoxA6wF1DJBskZp4QRnRWZSuMAttZm8XTbt55IE=; b=FkFoimry8UcgsFXwRsAaWHzFwxmQlw82uqijmsUSMqYtQ2+oIjqOFoaTjbXv7yK7RT f8xzcOouYTLg8U7l1NIooXGlCT24AkkYdc5c4zK42t3GqXyYc2dxKOpOk+CEcb8HD09j lGRNUKooNby8FKMzM0PMQhTnqN6O1S7SzD+566aEoGq92IgPi1I+KzDwsr5sicLEgRhr lXlvOEnnaLVeksPuxZsfXE28GWT17cPOXfh0wXE8d8iX596kEcBZKhb13HPTG39uEfCs 2tYjMk1VJxWkPqC85P7eeyH+HOCbaAZcCiUQ3vcPKiROhBV6XnUI9crraVt0ncU8fueY pDLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0a6iLoxA6wF1DJBskZp4QRnRWZSuMAttZm8XTbt55IE=; b=mJ3BuVWpRc/YLV+bITjlYCuuAKSLZ2xp/F0IkMzoYEODrGfoDNqg8l+YYqC39Zo2AD Efy9FBgpfWBFMyvWXvqHp7G1Lc75y+Jm6aGbwW2RfwmrLcnDnK/LzvygVHlSjuImwKZ9 7An/MHzzazk3NYDkg5qoVI9ai3RnJQMh3o4l5KJJoLO1iYYtso8sp+J6CmFqQnYh2oDE 1Hy8GWWoOySyshgVBzP5UhCqHxIbPCnMKrAzUPeUhADI9ZbTimKo3sTazIKMLuZOalcG mRt+tXbKxC9Lx0IQrr/edTDY+8/olELGIAzwG51oPg9GE3nNdh26Pc14QjiZzkt+0m7m 4VXQ== X-Gm-Message-State: AA+aEWajp0x58/szHprVBHSGJJoqUWEMoD3PeQffMHA/cg6Dt0AchQZx 5O0C82CgjBX2gP0coyvFxeZntMy0cPmH3oZINKVH3oFwsWR4G1TasDdBvgWyUDVxQvzg684ahMD krYP6Kn/0s/9PPO8505n/ X-Received: by 2002:a24:3282:: with SMTP id j124mr11757075ita.173.1545794330955; Tue, 25 Dec 2018 19:18:50 -0800 (PST) X-Google-Smtp-Source: AFSGD/WftqB9KCTFRY9ZyUZ6oBd5zjtWRNPWRRNttOps53AenS3SuGmlhIEQDMoTrZAAVPRKCpLScw== X-Received: by 2002:a24:3282:: with SMTP id j124mr11757065ita.173.1545794330743; Tue, 25 Dec 2018 19:18:50 -0800 (PST) Received: from localhost.localdomain (host-173-230-104-22.mnmigsc.mn.minneapolis.us.clients.pavlovmedia.net. [173.230.104.22]) by smtp.gmail.com with ESMTPSA id m37sm12241104iti.6.2018.12.25.19.18.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Dec 2018 19:18:49 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, "J. Bruce Fields" , Jeff Layton , Trond Myklebust , Anna Schumaker , "David S. Miller" , Chuck Lever , linux-nfs@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] sunrpc: fix a missing check of xdr_inline_decode Date: Tue, 25 Dec 2018 21:18:21 -0600 Message-Id: <20181226031823.72962-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.2 (Apple Git-113) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org xdr_inline_decode() could fail. When it fails, the return value is NULL and should not be dereferenced. The fix checks if xdr_inline_decode fails, and if so, returns. Signed-off-by: Kangjie Lu --- net/sunrpc/xprtrdma/backchannel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c index e5b367a3e517..bd9be5272ef4 100644 --- a/net/sunrpc/xprtrdma/backchannel.c +++ b/net/sunrpc/xprtrdma/backchannel.c @@ -285,6 +285,8 @@ void rpcrdma_bc_receive_call(struct rpcrdma_xprt *r_xprt, __be32 *p; p = xdr_inline_decode(&rep->rr_stream, 0); + if (unlikely(!p)) + goto out_overflow; size = xdr_stream_remaining(&rep->rr_stream); #ifdef RPCRDMA_BACKCHANNEL_DEBUG