From patchwork Tue May 9 13:50:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 9717989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 508A960237 for ; Tue, 9 May 2017 13:52:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4606726E46 for ; Tue, 9 May 2017 13:52:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3ADEA28414; Tue, 9 May 2017 13:52:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 5308F26E46 for ; Tue, 9 May 2017 13:52:26 +0000 (UTC) Received: (qmail 28055 invoked by uid 550); 9 May 2017 13:51:53 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 27974 invoked from network); 9 May 2017 13:51:51 -0000 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references; s=mail; bh=DAuh njZC1Wf6nY7vMp/xv2TUg9k=; b=GslS/KHPLqpKhzoOmMv0zW0wPhwVTDjtJGFC ZWxW8A42R+L7fVt3rtHRQsB8fYM5jwxl+yLV2kOcYhTsYChKRvNRHm+26CLGM6OK a6HK3WsqEMVwTB8D0RZTgCpBVlA2z6dnG8ogtq9hSRikM0Oc4t4x+7QoMBYqnTzC W+Hlil/aZtnoFcbzncvg1xNvngp7ihxI841XRFG07cXRuhdbRvuUaTBNXlVFfh4s k71TK0RbdjJeuAs9AZ+Uqm6ynADp8/winlplyFQ9L8EmJEhpjMTc0fuYRNJdGD8Y GfJ1Ni/dSIF7SE1MV146d0/3Kbc5QfL2jQ7PqfL2j7y+IZtb/w== From: "Jason A. Donenfeld" To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, kernel-hardening@lists.openwall.com Cc: "Jason A. Donenfeld" , "Michael S. Tsirkin" , Jason Wang Date: Tue, 9 May 2017 15:50:09 +0200 Message-Id: <20170509135009.13751-6-Jason@zx2c4.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170509135009.13751-1-Jason@zx2c4.com> References: <20170509135009.13751-1-Jason@zx2c4.com> Subject: [kernel-hardening] [PATCH v7 5/5] virtio_net: check return value of skb_to_sgvec always X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jason A. Donenfeld Cc: "Michael S. Tsirkin" Cc: Jason Wang --- drivers/net/virtio_net.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index f36584616e7d..1709fd0b4bf7 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1081,7 +1081,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) struct virtio_net_hdr_mrg_rxbuf *hdr; const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; struct virtnet_info *vi = sq->vq->vdev->priv; - unsigned num_sg; + int num_sg; unsigned hdr_len = vi->hdr_len; bool can_push; @@ -1114,6 +1114,8 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) sg_set_buf(sq->sg, hdr, hdr_len); num_sg = skb_to_sgvec(skb, sq->sg + 1, 0, skb->len) + 1; } + if (unlikely(num_sg < 0)) + return num_sg; return virtqueue_add_outbuf(sq->vq, sq->sg, num_sg, skb, GFP_ATOMIC); }