From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Edmondson Newsgroups: gmane.emacs.devel Subject: [PATCH] fix conv_lisp_to_sockaddr for AF_INET6 addresses Date: Sat, 06 Feb 2016 16:06:17 +0000 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1454774788 23288 80.91.229.3 (6 Feb 2016 16:06:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Feb 2016 16:06:28 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 06 17:06:28 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aS5NU-0001YV-8n for ged-emacs-devel@m.gmane.org; Sat, 06 Feb 2016 17:06:28 +0100 Original-Received: from localhost ([::1]:54749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aS5NT-0008Ot-BE for ged-emacs-devel@m.gmane.org; Sat, 06 Feb 2016 11:06:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aS5NP-0008Oo-2b for emacs-devel@gnu.org; Sat, 06 Feb 2016 11:06:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aS5NO-0005Ip-3e for emacs-devel@gnu.org; Sat, 06 Feb 2016 11:06:23 -0500 Original-Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:35534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aS5NN-0005Ii-PW for emacs-devel@gnu.org; Sat, 06 Feb 2016 11:06:22 -0500 Original-Received: by mail-wm0-x22f.google.com with SMTP id r129so63280560wmr.0 for ; Sat, 06 Feb 2016 08:06:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dme-org.20150623.gappssmtp.com; s=20150623; h=to:subject:from:date:message-id:mime-version:content-type; bh=/oGLr62apdVbaFnPIQsJPQazBlbsyqURVMwfvf3lzCc=; b=PFq0EIp+8HPhSqwv6GnoZXHRBoojMILXvHXMHbaZIdVJWLmrwBKHTCt3VTvnD78p45 GAEgD4dQZ58/Qy40UqkDS/i90pLTt84RmEE9GW0iZqUrQc13WbWIaKNAKK+GMUlJ+S7E 7belXrqPt1jo+RK/B6nFCns5u+Wsom9gtmWIOYl9+QrHQbEJdE92CgbKf3BTP+RIiV4a PqtvxKzL7SaFKZznCSpBkYl2OAdXda+wXjUQ+Gafr2JUQX6I0aK8uL6C7IXswo3Q4s54 aJpZmRQzd3cRSqRlPNsUzdqCbTOlhyXRGUnliq3BfRZWG2426Sew25Opyw1TZbj33kNf 7XPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:subject:from:date:message-id:mime-version :content-type; bh=/oGLr62apdVbaFnPIQsJPQazBlbsyqURVMwfvf3lzCc=; b=T1KczqpfplMonBAsYYbh5BhQdnXt99Ur/+fVIvwI31FnWADNcWobaqe38EPsakFimo 0HVZN3AjhT+rjQmW3AnPkhzGcZrGxCalAwqAkqy/4PLlIQRfMmDPyN8Ev5XQC/3AgDE/ AgUL2CW1A3OR0aO/wIE0Jra54GvDagINqMqi1eyD7T5UjfaDYpgi5eD1SAY3M4LsBT3v JE12T3g9Haj1w0uV7XxRUOrMXC23nKX3qru9+D3kDRvlInEqKejClN9c1KqpHuCw0bnJ sWL2Tl3kcCxwmJNJb7V57meKJDISFdvNfvyuRHyZI9OFPsdlQuUKxukIpXqbj71nVH1r Me2A== X-Gm-Message-State: AG10YOQgmc96LZjYvJSEgS5tKq2bHeiUtLE2XL4zk4FG87rgX3h1VGBUlj6Y1DhGRo37Zw== X-Received: by 10.194.200.106 with SMTP id jr10mr21708567wjc.100.1454774780749; Sat, 06 Feb 2016 08:06:20 -0800 (PST) Original-Received: from disaster-area.hh.sledj.net ([2a01:348:1a2:1:ea39:35ff:fe2c:a227]) by smtp.gmail.com with ESMTPSA id hm9sm20915589wjb.34.2016.02.06.08.06.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2016 08:06:19 -0800 (PST) Original-Received: from localhost (disaster-area.hh.sledj.net [local]) by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 6154320a; Sat, 6 Feb 2016 16:06:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22f X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:199422 Archived-At: When trying to test Lars' async-dns changes I encountered memory corruption whenever the addresses returned for a host included IPv6 addresses. This turns out to be a bug in the mainline code which is just more likely to be tickled by the async-dns changes because they convert addresses to lisp objects whenever `make-network-process' is called (the current code doesn't do that). Here is a proposed fix: >From c9995971d47e78475fb5ec9d9b34d2187941227f Mon Sep 17 00:00:00 2001 Date: Sat, 6 Feb 2016 16:02:23 +0000 Subject: [PATCH] * src/process.c (conv_lisp_to_sockaddr): Correctly convert AF_INET6 addresses AF_INET6 addresses are converted to a list of 16 bit quantities by conv_sockaddr_to_lisp(). conv_lisp_to_sockaddr() should follow the same scheme rather than expecting a (longer) list of 8 bit quantities. --- src/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/process.c b/src/process.c index e1ebdff..1eac5e1 100644 --- a/src/process.c +++ b/src/process.c @@ -2372,7 +2372,7 @@ conv_lisp_to_sockaddr (int family, Lisp_Object address, struct sockaddr *sa, int { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa; uint16_t *ip6 = (uint16_t *)&sin6->sin6_addr; - len = sizeof (sin6->sin6_addr) + 1; + len = sizeof (sin6->sin6_addr) / 2 + 1; hostport = XINT (p->contents[--len]); sin6->sin6_port = htons (hostport); for (i = 0; i < len; i++) -- 2.6.3