From patchwork Sun Apr 7 11:51:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 234492 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 69F202C00A0 for ; Sun, 7 Apr 2013 21:53:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933553Ab3DGLxC (ORCPT ); Sun, 7 Apr 2013 07:53:02 -0400 Received: from mail-bk0-f41.google.com ([209.85.214.41]:56409 "EHLO mail-bk0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933500Ab3DGLwe (ORCPT ); Sun, 7 Apr 2013 07:52:34 -0400 Received: by mail-bk0-f41.google.com with SMTP id i18so2680875bkv.28 for ; Sun, 07 Apr 2013 04:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=U7SWiWF+47u+D/gmYlGgknP4kuvQ6PulWCyNpFNTomY=; b=VXHqXhfJKb5lWLL9oL6XGceJRUcFv6SP5E9+Mo5C1JbWTSOqV/1a3t4B5r84j/Abjx 4H2BKorkL8HHj4bNg8zSkZuChjiVZarm1o85VtqZUvofce3Z+8u6E/DXu3kXAuqvGDr6 DgQBh7+wHV7rOc349Wk7TQSxFUXyQQR5DuT6gViQXQ/ZlS/istaKERyr/cb+lxl8dp7d DAtmH/0GMXmnHBcnilIqOUy+nRNsuoZnYD1FIF7cEFOujaOjva9f4W09i0/4UyGidNP3 Ti+5lDB8eR+jLVj36qBAn7Sl4jhaLmmXpoooH0MnxPbt5fzxF4kOhFewO6Jqt+exExUh nJ/g== X-Received: by 10.204.98.77 with SMTP id p13mr921360bkn.86.1365335552759; Sun, 07 Apr 2013 04:52:32 -0700 (PDT) Received: from jig.fritz.box (pD9EB4E1C.dip.t-dialin.net. [217.235.78.28]) by mx.google.com with ESMTPS id da16sm1974758bkb.2.2013.04.07.04.52.31 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 07 Apr 2013 04:52:32 -0700 (PDT) From: Mathias Krause To: "David S. Miller" Cc: netdev@vger.kernel.org, Allan Stephens , Aloisio Almeida Jr , Andy King , Arnaldo Carvalho de Melo , Dmitry Torokhov , George Zhang , Gustavo Padovan , Johan Hedberg , Jon Maloy , Lauro Ramos Venancio , Marcel Holtmann , Ralf Baechle , Samuel Ortiz , Samuel Ortiz , Sjur Braendeland , Ursula Braun , Brad Spengler , Mathias Krause Subject: [PATCH 08/16] iucv: Fix missing msg_namelen update in iucv_sock_recvmsg() Date: Sun, 7 Apr 2013 13:51:54 +0200 Message-Id: <1365335522-29931-9-git-send-email-minipli@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365335522-29931-1-git-send-email-minipli@googlemail.com> References: <1365335522-29931-1-git-send-email-minipli@googlemail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current code does not fill the msg_name member in case it is set. It also does not set the msg_namelen member to 0 and therefore makes net/socket.c leak the local, uninitialized sockaddr_storage variable to userland -- 128 bytes of kernel stack memory. Fix that by simply setting msg_namelen to 0 as obviously nobody cared about iucv_sock_recvmsg() not filling the msg_name in case it was set. Cc: Ursula Braun Signed-off-by: Mathias Krause Acked-by: Ursula Braun --- Remark: I failed to test that one as I've no access to a S390 system. net/iucv/af_iucv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index a7d11ffe..bf69358 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -1328,6 +1328,8 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct sk_buff *skb, *rskb, *cskb; int err = 0; + msg->msg_namelen = 0; + if ((sk->sk_state == IUCV_DISCONN) && skb_queue_empty(&iucv->backlog_skb_q) && skb_queue_empty(&sk->sk_receive_queue) &&