From patchwork Fri Jan 23 12:30:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Teras X-Patchwork-Id: 20040 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 8CE0DDDF7F for ; Fri, 23 Jan 2009 23:30:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754377AbZAWMaf (ORCPT ); Fri, 23 Jan 2009 07:30:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753983AbZAWMaf (ORCPT ); Fri, 23 Jan 2009 07:30:35 -0500 Received: from fk-out-0910.google.com ([209.85.128.190]:38488 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753353AbZAWMae (ORCPT ); Fri, 23 Jan 2009 07:30:34 -0500 Received: by fk-out-0910.google.com with SMTP id f33so1215622fkf.5 for ; Fri, 23 Jan 2009 04:30:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=tYNFvpFaWuIZ6a1YGdys7M/iSsEizSmymcDZp9NWPWw=; b=Mag+r5xF6xTzh/wc2cbro4Xx9uHEqSGtfaHtxhqSsNCauqPFT+MW6UcfB54ZjNzsFc IOz2qGz65MFP/7Ub0GzoCOSNkVnzfi/Z57MyXUH74EYT7MUc8FyYXpm9LJPJcKpwkYSF A9W5HZUF7EbnLgvI4s4hqPGY8w3EYVDh69BYc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=D4ux/fNxEbOpSL7pFr+nPdy1gOiNwx+7K7GuE97MCm374C10JoQiVEPeYn/RA13THl 8+QuO4nYZg+sCpebOLgwegu9ecvYOl4knWfbXffJsRjGS267NBlrXQ7EqHXPvMuVpasw l4zv71WarTVfKwT4OPZ/HLbWG7H52Dp2O+3BU= Received: by 10.181.197.6 with SMTP id z6mr162082bkp.213.1232713832540; Fri, 23 Jan 2009 04:30:32 -0800 (PST) Received: from localhost.localdomain (xdsl-83-150-94-239.nebulazone.fi [83.150.94.239]) by mx.google.com with ESMTPS id 35sm18296738fkt.23.2009.01.23.04.30.31 (version=SSLv3 cipher=RC4-MD5); Fri, 23 Jan 2009 04:30:32 -0800 (PST) From: Timo Teras To: netdev@vger.kernel.org Cc: Timo Teras , Herbert Xu Subject: [PATCH] af_key: initialize xfrm encap_oa Date: Fri, 23 Jan 2009 14:30:28 +0200 Message-Id: <1232713828-6725-1-git-send-email-timo.teras@iki.fi> X-Mailer: git-send-email 1.5.6.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently encap_oa is left uninitialized, so it contains garbage data which is visible to userland via Netlink. Initialize it by zeroing it out. Signed-off-by: Timo Teras Cc: Herbert Xu Acked-by: Herbert Xu --- net/key/af_key.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index f8bd8df..7dcbde3 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1285,6 +1285,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, ext_hdrs[SADB_X_EXT_NAT_T_DPORT-1]; natt->encap_dport = n_port->sadb_x_nat_t_port_port; } + memset(&natt->encap_oa, 0, sizeof(natt->encap_oa)); } err = xfrm_init_state(x);