From patchwork Wed Jun 26 21:52:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 254878 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 174CA2C007C for ; Thu, 27 Jun 2013 07:53:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752563Ab3FZVxR (ORCPT ); Wed, 26 Jun 2013 17:53:17 -0400 Received: from mail-bk0-f47.google.com ([209.85.214.47]:45297 "EHLO mail-bk0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479Ab3FZVxP (ORCPT ); Wed, 26 Jun 2013 17:53:15 -0400 Received: by mail-bk0-f47.google.com with SMTP id jg1so5120239bkc.20 for ; Wed, 26 Jun 2013 14:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=/c3FSQTrP1Pl777XJEa+FoaJlCa7rZz3fkVdDNP8jzE=; b=xK8NEe/AiUCthKISlp2DFTArDtChQDnUcHI3C7hB2spkOcBeD7MKuJpTiEEt+dP+VG RiwnFgaaqEcYWEETsUUnviSRxLEzsRqSqOibXDdCHxPhqF8/TexEzMeVqakECudHe3v6 Fi1OExEXmYUPiaptMsPrUtjXnh+j58sn+4ztt0OvKQYUNN0wEupqKGcNtkHakIaJ/YpG AO17n1UmpygxTUE/C2ZRAM4EeuQL68iDAQSiNQAu7qPdVC6fjujPmljpCVsRC0srepqN lRRzH2PCyrTlIwH4eJRYO2wWkNm6YwLpVRrl+JQ4JfX3HF235RpoNgoGJDx/7RdgFqxR O6sA== X-Received: by 10.205.34.132 with SMTP id ss4mr793080bkb.125.1372283594567; Wed, 26 Jun 2013 14:53:14 -0700 (PDT) Received: from jig.fritz.box (pD9EB15FE.dip0.t-ipconnect.de. [217.235.21.254]) by mx.google.com with ESMTPSA id px7sm3547191bkb.9.2013.06.26.14.53.13 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 14:53:13 -0700 (PDT) From: Mathias Krause To: Steffen Klassert , "David S. Miller" Cc: Mathias Krause , netdev@vger.kernel.org, Herbert Xu Subject: [PATCH] af_key: fix info leaks in notify messages Date: Wed, 26 Jun 2013 23:52:30 +0200 Message-Id: <1372283550-29911-1-git-send-email-minipli@googlemail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org key_notify_sa_flush() and key_notify_policy_flush() miss to initialize the sadb_msg_reserved member of the broadcasted message and thereby leak 2 bytes of heap memory to listeners. Fix that. Signed-off-by: Mathias Krause Cc: Steffen Klassert Cc: "David S. Miller" Cc: Herbert Xu --- net/key/af_key.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/key/af_key.c b/net/key/af_key.c index c5fbd75..9da8620 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1710,6 +1710,7 @@ static int key_notify_sa_flush(const struct km_event *c) hdr->sadb_msg_version = PF_KEY_V2; hdr->sadb_msg_errno = (uint8_t) 0; hdr->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t)); + hdr->sadb_msg_reserved = 0; pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_ALL, NULL, c->net); @@ -2699,6 +2700,7 @@ static int key_notify_policy_flush(const struct km_event *c) hdr->sadb_msg_errno = (uint8_t) 0; hdr->sadb_msg_satype = SADB_SATYPE_UNSPEC; hdr->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t)); + hdr->sadb_msg_reserved = 0; pfkey_broadcast(skb_out, GFP_ATOMIC, BROADCAST_ALL, NULL, c->net); return 0;