From patchwork Sun Apr 7 11:51:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 234483 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 A6C6D2C00BB for ; Sun, 7 Apr 2013 21:52:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933503Ab3DGLwe (ORCPT ); Sun, 7 Apr 2013 07:52:34 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:59078 "EHLO mail-bk0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933488Ab3DGLwc (ORCPT ); Sun, 7 Apr 2013 07:52:32 -0400 Received: by mail-bk0-f44.google.com with SMTP id jk13so2716735bkc.31 for ; Sun, 07 Apr 2013 04:52:31 -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=MDNdzUnE9Yz5C3TROKt2DwacBSrkJMBhz0TnBOZnYpg=; b=GADd2LOAtDCuZX2E5guHWCrdSSxR5p/HLbtvH0Nv0fXLshJLIkA8Z84Yqe7M2o0Uc/ Vvmx68RCfz6h0NTaU/HCGkoh4Kr4qgbUFLEi4y/OJobFWhqfsVU99XdmS7ws/TrTdp2h 93VPnZmxSTUlaBBPkZpshG65GhF5TbbuYTtJtNjIs37xVx4oOXrms+BEIH0K78kFfZaa PamkSONE3gbfqfiwX0T7KDa0EXZmCaXfxiOMapoLQi/ySN2+glIg7MIQJUObvRtmj2UA 3hBUsY6YgQvP1wGXRBjEJXVYvkgqpaZIp7ONKYUg3AWqvWCpmGJM4cCLocjpSFZbWoM+ HG9g== X-Received: by 10.204.166.133 with SMTP id m5mr9549541bky.78.1365335551436; Sun, 07 Apr 2013 04:52:31 -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.30 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 07 Apr 2013 04:52:30 -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 07/16] irda: Fix missing msg_namelen update in irda_recvmsg_dgram() Date: Sun, 7 Apr 2013 13:51:53 +0200 Message-Id: <1365335522-29931-8-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 irda_recvmsg_dgram() not filling the msg_name in case it was set. Cc: Samuel Ortiz Signed-off-by: Mathias Krause --- net/irda/af_irda.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index d28e7f0..e493b33 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1386,6 +1386,8 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock, IRDA_DEBUG(4, "%s()\n", __func__); + msg->msg_namelen = 0; + skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, flags & MSG_DONTWAIT, &err); if (!skb)