From patchwork Thu Feb 10 17:59:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kulikov X-Patchwork-Id: 82640 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 9E7F8B7106 for ; Fri, 11 Feb 2011 05:00:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756697Ab1BJR7w (ORCPT ); Thu, 10 Feb 2011 12:59:52 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:57478 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753517Ab1BJR7v (ORCPT ); Thu, 10 Feb 2011 12:59:51 -0500 Received: by bwz15 with SMTP id 15so2366794bwz.19 for ; Thu, 10 Feb 2011 09:59:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer; bh=SFEt9HR7vexVcuvl/agkzQ9zUqMyI0AWnL+rd+ZgAYY=; b=knCGb92vAR1UdbH3OXYyerkMRCyWjdHEM6pBjl06slmaRUdt1Pucra5xbPviXhSztH 4P8f4f5dVk4uHZSoCWLfb06bY8135ANGs19NXrmiTRh12QkcsyypbWrxQMfGXtONyTZj BwIuNpSUA+ZKTkv9fJOKs6QZ2RobyAruYiLa0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=c/hmpqhy+vkFuWxb1HLjDm25GT233RrdpRUI0+6fPhCfavmrBFGLThprv+KRifWDBZ W4oCw+QrHlIqK+atVdKXgRCVfhvp9YbSjqJfmxzYYxyRmtSimOCS/Xa2xz2eOIEGS1vY oQ4seFm2lvVAl4I4E2g3YcCVXXO/XSS+pFfkM= Received: by 10.204.76.1 with SMTP id a1mr20617669bkk.5.1297360789310; Thu, 10 Feb 2011 09:59:49 -0800 (PST) Received: from localhost (ppp91-77-43-238.pppoe.mtu-net.ru [91.77.43.238]) by mx.google.com with ESMTPS id v1sm190580bkt.17.2011.02.10.09.59.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Feb 2011 09:59:48 -0800 (PST) From: Vasiliy Kulikov To: linux-kernel@vger.kernel.org Cc: security@kernel.org, Marcel Holtmann , "Gustavo F. Padovan" , "David S. Miller" , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] bluetooth: l2cap: fix 1 byte infoleak to userspace Date: Thu, 10 Feb 2011 20:59:42 +0300 Message-Id: <1297360783-21452-1-git-send-email-segoon@openwall.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Structure l2cap_options has one padding byte between max_tx and txwin_size fields. This byte in "opts" is copied to userspace uninitialized. Signed-off-by: Vasiliy Kulikov --- Compile tested only. net/bluetooth/l2cap_sock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index adf4169..21f5385 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -392,6 +392,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us switch (optname) { case L2CAP_OPTIONS: + memset(&opts, 0, sizeof(opts)); opts.imtu = l2cap_pi(sk)->imtu; opts.omtu = l2cap_pi(sk)->omtu; opts.flush_to = l2cap_pi(sk)->flush_to;