From patchwork Tue May 9 13:50: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: 760142 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 3wMgn13q65z9s65 for ; Tue, 9 May 2017 23:53:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=zx2c4.com header.i=@zx2c4.com header.b="wgHXmwQt"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754306AbdEINxA (ORCPT ); Tue, 9 May 2017 09:53:00 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:36287 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753448AbdEINvr (ORCPT ); Tue, 9 May 2017 09:51:47 -0400 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id f78fa0f8; Tue, 9 May 2017 13:41:17 +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=n5G5 PCv0QP5L0LzW140urO5pX6o=; b=wgHXmwQtu3wrxQ87AP2LMi+nXX305Gxi7WWB NFA2t9OOkFik0fpgxM2Iemu+fdnmp18+86SZSWH0K/8iR4yKZcE2FzpxcUA35W/1 kNJm+yT1G3/9Gzbbe9mjecVMrsWjqHtFVUqgVy2fLoXqO4QxKr6/DN9uLnPgSoEM p02ES4ad3W1KpPW46+BWs2RKOzSCH8LyCzjKWTEbBthQaewEy3WbIxA5H8l52uqT rub12ad2+UVqnyHwUtfFnC+OGc+Q0SPHk/5WmRAbY5A1cIUNHTQ0iL9HWP+N1+yw wUwaMr/F0ze/PynUeB7s+RixtLfiqDE/pVX4+586oiTYaH1a9w== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 62aa539a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 9 May 2017 13:41:16 +0000 (UTC) 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" , David Howells Subject: [PATCH v7 3/5] rxrpc: check return value of skb_to_sgvec always Date: Tue, 9 May 2017 15:50:07 +0200 Message-Id: <20170509135009.13751-4-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jason A. Donenfeld Cc: David Howells --- net/rxrpc/rxkad.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index 4374e7b9c7bf..486026689448 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,11 @@ 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)) { + if (sg != _sg) + kfree(sg); + goto nomem; + } /* decrypt from the session key */ token = call->conn->params.key->payload.data[0];