Received: by 10.223.185.116 with SMTP id b49csp1067046wrg; Fri, 23 Feb 2018 11:18:41 -0800 (PST) X-Google-Smtp-Source: AH8x2265shVIlTv+syofsmGglO6JnPQAnNMhlG0Li9w+Hka74VryuwTkG+5iQAI+uOe7lSJGJZhz X-Received: by 10.99.117.83 with SMTP id f19mr2182492pgn.318.1519413521482; Fri, 23 Feb 2018 11:18:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413521; cv=none; d=google.com; s=arc-20160816; b=Xr3hLZdwUF5BjBSuoFl9F2q44wM2f5ugE1C3g0iNlVE+xJnAsaATD8tDvtl0m1bLIv vjGvsxtBCC7O15Zi0aQCCtthF9CYmc9XS79R3x74aoJdJi+AHSHvaWtrGTPcB8wfcLt+ ue/pVTYowZb8mdtwaGw0bmEocDJ6z3cecT/plUkLDB+dxkblqZ+7/TiCh5aFKF5xHRJV qCT56ts0nUEMM568lxHZJgTuR3i0xP97w0JPlUL5CpmI4uVOQuGWHNVofdKOwCxxoBbL DCqtw7U4JP1Njd4Bbos+QYzjmsy3V/iOwD4DzQ+PAsR5wZCB5G+3XxdqvvWzt3sAae0L 7B6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=zCXED9DAsFvSnveyj1i4/cHPwe9t9NGPNCM2iCHO/3U=; b=Txfc5kN4CViJKB9LaTzfeG19xhW5usyFcPgNMGQ519iuyE/z/eYV+Yp47ZYLsqx0S3 Eol1UuzAR2/GhyJ21ldHCt95uWW8Nv0HfP3qBKXLB31Y9gGJkdyXSgoHfz8PWHR46G9D pvwCxEH7GWQqu/6YZjncAKoh+DKDEXJ2q0EnukH3kK77pWVElqgaj0lXL6C8qMp3TjaZ y6S9l9ZDSkFBE9l68bF6G3doin5Zzs3z5V30SS1maWqFQihI8X37lDWqB1Kphmb7DESP C8SIGefxNRgkvUvxqNnKtBujyiXyuSAAEzgTnB00TgEIgAyKNxhnBStVTMyANbxEFDhZ PdFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t18si2242938pfg.246.2018.02.23.11.18.27; Fri, 23 Feb 2018 11:18:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965024AbeBWSyx (ORCPT + 99 others); Fri, 23 Feb 2018 13:54:53 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47938 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965010AbeBWSyt (ORCPT ); Fri, 23 Feb 2018 13:54:49 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 291DA1235; Fri, 23 Feb 2018 18:54:48 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yunjian Wang , "Michael S. Tsirkin" , Sasha Levin Subject: [PATCH 4.14 122/159] virtio_net: fix return value check in receive_mergeable() Date: Fri, 23 Feb 2018 19:27:10 +0100 Message-Id: <20180223170758.030455053@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yunjian Wang [ Upstream commit 03e9f8a05bce7330bcd9c5cc54c8e42d0fcbf993 ] The function virtqueue_get_buf_ctx() could return NULL, the return value 'buf' need to be checked with NULL, not value 'ctx'. Signed-off-by: Yunjian Wang Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -714,7 +714,7 @@ static struct sk_buff *receive_mergeable int num_skb_frags; buf = virtqueue_get_buf_ctx(rq->vq, &len, &ctx); - if (unlikely(!ctx)) { + if (unlikely(!buf)) { pr_debug("%s: rx error: %d buffers out of %d missing\n", dev->name, num_buf, virtio16_to_cpu(vi->vdev,