From patchwork Tue Apr 25 14:08:07 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: 754842 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wC4nV0BKjz9s8G for ; Wed, 26 Apr 2017 00:08:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=zx2c4.com header.i=@zx2c4.com header.b="KnAlZ8f8"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1431440AbdDYOIg (ORCPT ); Tue, 25 Apr 2017 10:08:36 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:53685 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1431427AbdDYOI3 (ORCPT ); Tue, 25 Apr 2017 10:08:29 -0400 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id c1248d58; Tue, 25 Apr 2017 13:59:47 +0000 (UTC) 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=iEby DWy+h8/LDmdYfRtHjX9XPro=; b=KnAlZ8f8cM9AXV8bUd93BPPU8875E5+BelaB oohYj05IdAcgtTkqPcFS25njdwUIId0dii1XQwBuB12iWelH51b07HvBuPY/qw/R +SUugwdX7vBHC4+ZBnjNkBqwg6DeUSAU+fCMk3VqoqdASQm92RVlafal2C8Q2cAE Qk2jvWJna7pJrK+zMxeZYqKGK1Iv+MzpmyA1jHQ18jZ0V3ThDqGPJ6Ibd2t6+6+7 +Z9F14adVXFpDch9mEI6GGT22a/gE2XeQtU6Cl4fb6XuXuLTof89UXuTArilaWWM J2HOgnMu1WLbL/9x36+8qTHP3qvVoI8oXuJVVjP7nRK8N6uXEQ== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 150727ff (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 25 Apr 2017 13:59:46 +0000 (UTC) From: "Jason A. Donenfeld" To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, David.Laight@aculab.com, kernel-hardening@lists.openwall.com Cc: "Jason A. Donenfeld" Subject: [PATCH 3/5] rxrpc: check return value of skb_to_sgvec always Date: Tue, 25 Apr 2017 16:08:07 +0200 Message-Id: <20170425140809.23881-3-Jason@zx2c4.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170425140809.23881-1-Jason@zx2c4.com> References: <20170425140809.23881-1-Jason@zx2c4.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jason A. Donenfeld --- net/rxrpc/rxkad.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index 4374e7b9c7bf..dcf46c9c3ece 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@ -229,7 +229,9 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call, len &= ~(call->conn->size_align - 1); sg_init_table(sg, nsg); - skb_to_sgvec(skb, sg, 0, len); + err = skb_to_sgvec(skb, sg, 0, len); + if (unlikely(err < 0)) + goto out; skcipher_request_set_crypt(req, sg, sg, len, iv.x); crypto_skcipher_encrypt(req); @@ -342,7 +344,8 @@ static int rxkad_verify_packet_1(struct rxrpc_call *call, struct sk_buff *skb, goto nomem; sg_init_table(sg, nsg); - skb_to_sgvec(skb, sg, offset, 8); + if (unlikely(skb_to_sgvec(skb, sg, offset, 8) < 0)) + goto nomem; /* start the decryption afresh */ memset(&iv, 0, sizeof(iv)); @@ -429,7 +432,8 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb, } sg_init_table(sg, nsg); - skb_to_sgvec(skb, sg, offset, len); + if (unlikely(skb_to_sgvec(skb, sg, offset, len) < 0)) + goto nomem; /* decrypt from the session key */ token = call->conn->params.key->payload.data[0];