From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180694-2-14875556708947767904 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180694; b=tcB7nPnUQyTpoRIVvPz2arrZJ1V6AwEU7A6SkFYTAUH8g5i 1lMDNQkgrk1TiaEBRDXfluFHXZmD9t3wBFA3fquG0+o9F0p/XfbDU94lXiWAC+bD xYEAg4vsgsK/NnDN6MMoFO2hLokS0wuZ9gdn8Uk+8iUrjqN+Jd65lIFJ+yVNrU2P UiyAAZAvqrxIuOlTko6sYBC+8GU73RUQ4AqSjSBIxl2Foj56G7xKAAEbUy94rhh8 EkmBrp9qAQwBxSVX0kCaPuGrDikoiAh3cauTQ6bfmNXZOrXSCOdiVK9YWe3WBit4 ULZAFwiKgdVDnc/HagtTA3qn2wJd3VHffFHjwLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180694; bh=u71icl 7ga3pD2tNyFfwWxfCTdods4RTK4kKEMWdlfsg=; b=XpjUaH6RtXzZE5LimhajXk kPzO25TkKZ9tZsqDOuypGQR/tUhDJj9tnxA3NKQzWzMqc+P3L6McAKiEcHLlXKSh 657NUK8JuRPcUcowOeSlrr7Mpy8Cfi8MGIalwG7vgmWmdYVZrty3UIIFiNMuBqXs pHtrL5K1rrKTNOYZ+frke3uaR0hEpS8SuAZL8dpm9EMihiGAsewadTy/lO/6/zlu oiS7C8taQG+ES/xOE2V0PKIbdhSr7+zCtt4o4cAzVyK4S2zd7zAgVraIBQ8Qqzzm tK0nn1eX/Sd1Ol3dMnO4VXv6kWEVGirPidxAo/fjC51u+bRrrj8p3DGLIyH1+Avw == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=W92l8JWh x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=W92l8JWh x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751707AbeA1XEj (ORCPT ); Sun, 28 Jan 2018 18:04:39 -0500 Received: from mail-by2nam03on0134.outbound.protection.outlook.com ([104.47.42.134]:46538 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752989AbeA1W1i (ORCPT ); Sun, 28 Jan 2018 17:27:38 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Yunjian Wang , "Michael S . Tsirkin" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 066/100] virtio_net: fix return value check in receive_mergeable() Thread-Topic: [PATCH AUTOSEL for 4.14 066/100] virtio_net: fix return value check in receive_mergeable() Thread-Index: AQHTmIcSNkZjXPUguUe8t2T9Fbwu8g== Date: Sun, 28 Jan 2018 22:26:42 +0000 Message-ID: <20180128222547.7398-66-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1034;6:BzVU0uaIZr2+j+AjQuour9vZvsdhXiMWUPpPDYnoHFYQcVk+1Oxi65pzO7AX4Q8qBrGtsLc62YUp+JFLAi1BF9x/+8J4fXJpBImhFGEhfPkaG0apN/2kxgJJWOm5jiE06MsTRXW22j6uV0MrK3TnitGNolT1r/bSblcQKKpPQi7UpyEdLXBpGqrqZFRpqFLSodJ86OJgk0+enPQHMr7qm5lSUMaKL5EWUmkKLpGSGds8JURSKeCnb3EW4JL7il62sM5bCwu/mBx/zm9+1e6qqA0iJ3FtXlthXbDnADJFrizG9diQPoDayh5M0nILak7B6GGs2ThUFF+FQK18z+w9Er4eMz6XJzjCBJpi8GtrR/ZV8CgOSFa84m8ppxRPM477;5:gfULJGz1Z8F+98YzN0s9JufGWGKp2Ica3e9HnyhrhZb2PJN0KZC5l1rOgq6x74P+pkdHV5zPLQfo8d5RrY6qx4MNoMixCx87FvU1lx0+H0luMqZNj133TlqsQAe+/mvwPywPeEbcDHEnVeTIl8qY5cJ/ApDrqLC6SCzwQHREufo=;24:R2j4ILjP44E5XlYBMRFM+mxINXjJ3RIrgoDVoTj+3Ra9trG+GREVhRTqZZD83peyI3veIuknd9cgoPydtsyAu+irOHEb4TWjWtCqr9ghWtA=;7:BO5x5zE8oLFcs9RzRaAAhpQCI4TklYOLV3m+Cv8WyiGJFEViZBcqcdEr1wzw6vZbQVBPA4HQMduZYgeuU+/WHq7yQkvwqJ/4WqP8dEIoZOdEd48EDsYdJTCp7QOa8mPCSPXOywlwuHk8TSjLsF7eFnsMUDFMMgjTNZgj6EoAgUdoTWkdiFxjmAFk6icFTnHpof3C7Ncctb9KHmQIYotaP82MUP3eVcwJMYzsDA1xL3DGRo7TJc9hSnAtVDZN8psr x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 0489857f-c68a-4124-3c64-08d5669e54b6 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(50582790962513); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(2950100002)(26005)(1076002)(66066001)(6116002)(5660300001)(3846002)(186003)(316002)(22452003)(54906003)(110136005)(6666003)(86612001)(36756003)(6486002)(575784001)(86362001)(53936002)(6436002)(6512007)(106356001)(8676002)(105586002)(305945005)(7736002)(68736007)(478600001)(81166006)(59450400001)(102836004)(76176011)(6506007)(72206003)(10290500003)(14454004)(2900100001)(3660700001)(99286004)(97736004)(81156014)(25786009)(8936002)(4326008)(5250100002)(3280700002)(2501003)(10090500001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: J4isVilo40UJK5jBvLCCRAM/7tQjkk2Rh+UwWz99pY8ZQybdf+byFzPYHLkVltmBlUUrLSO5oEHmHqSZAhlZqA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0489857f-c68a-4124-3c64-08d5669e54b6 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:42.0447 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 --- drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 511f8339fa96..7927e28f5336 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -714,7 +714,7 @@ static struct sk_buff *receive_mergeable(struct net_dev= ice *dev, int num_skb_frags; =20 buf =3D 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, --=20 2.11.0