From patchwork Sun Jun 4 02:16:25 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: 9764603 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 9D97B6032D for ; Sun, 4 Jun 2017 02:17:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DBEF23E64 for ; Sun, 4 Jun 2017 02:17:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81FE425D9E; Sun, 4 Jun 2017 02:17:37 +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 B330323E64 for ; Sun, 4 Jun 2017 02:17:36 +0000 (UTC) Received: (qmail 5406 invoked by uid 550); 4 Jun 2017 02:17:10 -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 3461 invoked from network); 4 Jun 2017 02:17:01 -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=wWhV jCZA8mJ3AAGf50qZuC1geGM=; b=po6ypd56dAopjRczfKKlazJPiDYGjIFkFLO0 LxIzu47p2rEIXvjkFr9NAi4LUtwW49b/po6U26ObX8nyZNCD78RAjIdn6FSgD9W5 +IgXgNZlfEWfzLbxqGGxkzBWWNNpqyYSbhNHi60M5njgt/WVo5X4vJhJ1ij3OW/G C6/35c0Aur4BFyJzuMZnhDrdzg1MUCZLNHWa8NJHJA5jROKSmMs31AN2dWoQwtdc W1B+xO1pWXqxb1a5e9/vHtgpJiCC1Y2+aD8q5B6DZeSiA6KzDLQiwExFg9AYch+N W7npI+oGxnLDq/ThAyalYJKdf6hqwpd+l9hxtCDFlZv9OUFaYg== 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" , Sabrina Dubroca Date: Sun, 4 Jun 2017 04:16:25 +0200 Message-Id: <20170604021626.11968-5-Jason@zx2c4.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170604021626.11968-1-Jason@zx2c4.com> References: <20170604021626.11968-1-Jason@zx2c4.com> Subject: [kernel-hardening] [PATCH net-next v10 4/5] macsec: check return value of skb_to_sgvec always X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jason A. Donenfeld Cc: Sabrina Dubroca --- drivers/net/macsec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 91642fd87cd1..b79513b8322f 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -740,7 +740,12 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb, macsec_fill_iv(iv, secy->sci, pn); sg_init_table(sg, ret); - skb_to_sgvec(skb, sg, 0, skb->len); + ret = skb_to_sgvec(skb, sg, 0, skb->len); + if (unlikely(ret < 0)) { + macsec_txsa_put(tx_sa); + kfree_skb(skb); + return ERR_PTR(ret); + } if (tx_sc->encrypt) { int len = skb->len - macsec_hdr_len(sci_present) - @@ -947,7 +952,11 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb, macsec_fill_iv(iv, sci, ntohl(hdr->packet_number)); sg_init_table(sg, ret); - skb_to_sgvec(skb, sg, 0, skb->len); + ret = skb_to_sgvec(skb, sg, 0, skb->len); + if (unlikely(ret < 0)) { + kfree_skb(skb); + return ERR_PTR(ret); + } if (hdr->tci_an & MACSEC_TCI_E) { /* confidentiality: ethernet + macsec header