From patchwork Fri Jul 21 16:37:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 9857313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D974360392 for ; Fri, 21 Jul 2017 16:38:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C71C128621 for ; Fri, 21 Jul 2017 16:38:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBF5628636; Fri, 21 Jul 2017 16:38:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65A4228621 for ; Fri, 21 Jul 2017 16:38:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754547AbdGUQiK (ORCPT ); Fri, 21 Jul 2017 12:38:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35668 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754531AbdGUQiI (ORCPT ); Fri, 21 Jul 2017 12:38:08 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 907F64E33A for ; Fri, 21 Jul 2017 16:38:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 907F64E33A Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=steved@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 907F64E33A Received: from steved.boston.devel.redhat.com (ovpn-121-35.rdu2.redhat.com [10.10.121.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4671817DC0 for ; Fri, 21 Jul 2017 16:38:08 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH 02/11] present_address: Fixed error path Date: Fri, 21 Jul 2017 12:37:57 -0400 Message-Id: <20170721163806.15803-3-steved@redhat.com> In-Reply-To: <20170721163806.15803-1-steved@redhat.com> References: <20170721163806.15803-1-steved@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 21 Jul 2017 16:38:08 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When inet_ntop fails do not fall into the AF_INET6 case, instead break out and take the error path out. Signed-off-by: Steve Dickson --- support/misc/tcpwrapper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/support/misc/tcpwrapper.c b/support/misc/tcpwrapper.c index 06b0a46..3128053 100644 --- a/support/misc/tcpwrapper.c +++ b/support/misc/tcpwrapper.c @@ -72,6 +72,7 @@ present_address(const struct sockaddr *sap, char *buf, const size_t buflen) case AF_INET: if (inet_ntop(AF_INET, &sin->sin_addr, buf, len) != 0) return; + break; case AF_INET6: if (inet_ntop(AF_INET6, &sin6->sin6_addr, buf, len) != 0) return;