Re: [PATCH] smtp-dummy: clear sockaddr_in structures before use.

diff --git a/d4/7e3fc76b45120a3f6ea8bcde6c629111cf30de b/d4/7e3fc76b45120a3f6ea8bcde6c629111cf30de
new file mode 100644 (file)
index 0000000..c26e509
--- /dev/null
+++ b/d4/7e3fc76b45120a3f6ea8bcde6c629111cf30de
@@ -0,0 +1,111 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 96DA1429E25\r
+       for <notmuch@notmuchmail.org>; Fri, 11 Nov 2011 18:37:43 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id OsOiLR1JFA+8 for <notmuch@notmuchmail.org>;\r
+       Fri, 11 Nov 2011 18:37:43 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1ECE9431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 11 Nov 2011 18:37:43 -0800 (PST)\r
+X-AuditID: 1209190f-b7f6e6d0000008df-a6-4ebddbf6704f\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id C6.16.02271.6FBDDBE4; Fri, 11 Nov 2011 21:37:42 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id pAC2bfmS017735; \r
+       Fri, 11 Nov 2011 21:37:42 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id pAC2bd5a004924\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 11 Nov 2011 21:37:41 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1RP3Vk-0005JW-LV; Fri, 11 Nov 2011 21:40:04 -0500\r
+Date: Fri, 11 Nov 2011 21:40:04 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>\r
+Subject: Re: [PATCH] smtp-dummy: clear sockaddr_in structures before use.\r
+Message-ID: <20111112024004.GX2658@mit.edu>\r
+References: <yf6k477a70b.fsf@taco2.nixu.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <yf6k477a70b.fsf@taco2.nixu.fi>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IRYrdT1/12e6+fwYt+NYvrN2cyW7xZOY/V\r
+       gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mo4u8+6YD1nxZPHq1kbGFezdzFyckgImEgs\r
+       3LuSCcIWk7hwbz1bFyMXh5DAPkaJ9UveMUE4GxglNpw/yg7hnGSSeHJwElTZEkaJ3Vd6WUH6\r
+       WQRUJd7t6wSbyyagIbFt/3JGEFtEQEXiQdt6sBpmAWmJb7+bwfYJC3hKnJ95CczmFdCWmPj+\r
+       D1iNEJD9a/sbVoi4oMTJmU9YIHq1JG78ewlUzwE2Z/k/DpAwp4COxNYVTWBjRIFWTTm5jW0C\r
+       o9AsJN2zkHTPQuhewMi8ilE2JbdKNzcxM6c4NVm3ODkxLy+1SNdELzezRC81pXQTIyisOSX5\r
+       dzB+O6h0iFGAg1GJh3dB0l4/IdbEsuLK3EOMkhxMSqK8J24BhfiS8lMqMxKLM+KLSnNSiw8x\r
+       SnAwK4nwds4FyvGmJFZWpRblw6SkOViUxHkbdzj4CQmkJ5akZqemFqQWwWRlODiUJHhbgfEr\r
+       JFiUmp5akZaZU4KQZuLgBBnOAzR8F0gNb3FBYm5xZjpE/hSjopQ4bxpIQgAkkVGaB9cLSzuv\r
+       GMWBXhHmrQGp4gGmLLjuV0CDmYAGsyiADS5JREhJNTCWH42P+hL+iiugY5Lyk6sKKS+rW9S6\r
+       hGvFz4i8Z90fZhcqk7Djg4qGfoUK36GHxhaWqqH/S9cIeW5Xt81Jbpz2TUtARaYgeA/Dafuf\r
+       b4LTNX0Nbzm3NRt5b5+3/c3F2q7bD71qJzcxLGDZ8Upo1/RraTWdcv6rBU7axgW5cE1epLPf\r
+       IGbCYiWW4oxEQy3mouJEAEwhyD8WAwAA\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 12 Nov 2011 02:37:43 -0000\r
+\r
+Looks good and is the right thing to do.\r
+\r
+The rest of smtp-dummy uses parens around sizeof operands, but whatever.\r
+\r
+It's probably not necessary to clear peer_addr, since it's an\r
+out-argument of accept and is never used (plus the example in bind(2)\r
+doesn't), but there's no harm.\r
+\r
+Quoth Tomi Ollila on Nov 11 at  1:32 am:\r
+> Any junk bytes in sockaddr_in structures before passing those\r
+> to bind() or accept() functions may cause problems.\r
+> ---\r
+>  test/smtp-dummy.c |    2 ++\r
+>  1 files changed, 2 insertions(+), 0 deletions(-)\r
+> \r
+> diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c\r
+> index 9da8202..38d1d62 100644\r
+> --- a/test/smtp-dummy.c\r
+> +++ b/test/smtp-dummy.c\r
+> @@ -159,6 +159,7 @@ main (int argc, char *argv[])\r
+>              return 1;\r
+>      }\r
+>  \r
+> +    memset (&addr, 0, sizeof addr);\r
+>      addr.sin_family = AF_INET;\r
+>      addr.sin_port = htons (25025);\r
+>      addr.sin_addr = *(struct in_addr *) hostinfo->h_addr;\r
+> @@ -178,6 +179,7 @@ main (int argc, char *argv[])\r
+>              return 1;\r
+>      }\r
+>  \r
+> +    memset (&peer_addr, 0, sizeof peer_addr);\r
+>      peer_addr_len = sizeof (peer_addr);\r
+>      peer = accept (sock, (struct sockaddr *) &peer_addr, &peer_addr_len);\r
+>      if (peer == -1) {\r