From patchwork Tue Oct 28 19:53:49 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 6147 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 19157DDE0E for ; Wed, 29 Oct 2008 06:53:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752559AbYJ1Txy (ORCPT ); Tue, 28 Oct 2008 15:53:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752543AbYJ1Txy (ORCPT ); Tue, 28 Oct 2008 15:53:54 -0400 Received: from wf-out-1314.google.com ([209.85.200.172]:47380 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752355AbYJ1Txx (ORCPT ); Tue, 28 Oct 2008 15:53:53 -0400 Received: by wf-out-1314.google.com with SMTP id 27so2778520wfd.4 for ; Tue, 28 Oct 2008 12:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=ckDbDLwgzEM1zaE5S0zdTqqAnnjQl3IzUx4am39kUjs=; b=gsDkHJWtOGqac8nGZhm7tBn/AKAvRuAwjr3bqz6UH2bmPx6f2u8AkzDB3SFkxAdpak fVLlNftulkyyy9xCVII9750uuggR68T8tLGwBGXASFLX69tSTAdhwT2G14dB4ZXcF3Ea zK7iL9A9AcVQsvKCqmwy6xvRfdbIpFGXysVY4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=hK6n9rPm7OPuVyl7Mjt0U9sGDIKN/vZRaQrSEM4JIVOBNfWlbZFqF4rW4DwFk5H9qc 5yZeBE5SEZF9ukY6A5yjX7U7UPG89/Uh2noCSsPQZ51s2jmmzj4RMJWUi2fhKJcyV2tD 7mHm4eDHibsejNBMsEb4INAOEagkVVBAJHkPo= Received: by 10.142.52.9 with SMTP id z9mr3544769wfz.194.1225223632956; Tue, 28 Oct 2008 12:53:52 -0700 (PDT) Received: from ?192.168.1.108? (216-19-190-48.dyn.novuscom.net [216.19.190.48]) by mx.google.com with ESMTPS id 29sm4418910wfg.0.2008.10.28.12.53.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 28 Oct 2008 12:53:52 -0700 (PDT) Subject: [PATCH 3/6] misc: replace NIP6_FMT with %p6 format specifier From: Harvey Harrison To: David Miller Cc: linux-netdev , Joe Perches Date: Tue, 28 Oct 2008 12:53:49 -0700 Message-Id: <1225223629.11483.41.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The iscsi_ibft.c changes are almost certainly a bugfix as the pointer 'ip' is a u8 *, so they never print the last 8 bytes of the IPv6 address, and the eight bytes they do print have a zero byte with them in each 16-bit word. Other than that, this should cause no difference in functionality. Signed-off-by: Harvey Harrison --- drivers/firmware/iscsi_ibft.c | 4 +--- drivers/scsi/iscsi_tcp.c | 2 +- fs/lockd/host.c | 2 +- fs/nfs/super.c | 3 +-- security/selinux/avc.c | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 4353414..0a64720 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c @@ -290,9 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip) /* * IPv6 */ - str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]), - ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]), - ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7])); + str += sprintf(str, "%p6", ip); } str += sprintf(str, "\n"); return str - buf; diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index ed6c54c..ef929ae 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -1608,7 +1608,7 @@ static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock, case AF_INET6: sin6 = (struct sockaddr_in6 *)addr; spin_lock_bh(&conn->session->lock); - sprintf(buf, NIP6_FMT, NIP6(sin6->sin6_addr)); + sprintf(buf, "%p6", &sin6->sin6_addr); *port = be16_to_cpu(sin6->sin6_port); spin_unlock_bh(&conn->session->lock); break; diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 9fd8889..344e6b4 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -122,7 +122,7 @@ static void nlm_display_address(const struct sockaddr *sap, snprintf(buf, len, NIPQUAD_FMT, NIPQUAD(sin6->sin6_addr.s6_addr32[3])); else - snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr)); + snprintf(buf, len, "%p6", &sin6->sin6_addr); break; default: snprintf(buf, len, "unsupported address family"); diff --git a/fs/nfs/super.c b/fs/nfs/super.c index f48db67..5fe7721 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -468,8 +468,7 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss, } case AF_INET6: { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap; - seq_printf(m, ",mountaddr=" NIP6_FMT, - NIP6(sin6->sin6_addr)); + seq_printf(m, ",mountaddr=%p6", &sin6->sin6_addr); break; } default: diff --git a/security/selinux/avc.c b/security/selinux/avc.c index cb30c7e..c91008f 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -495,7 +495,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab, char *name1, char *name2) { if (!ipv6_addr_any(addr)) - audit_log_format(ab, " %s=" NIP6_FMT, name1, NIP6(*addr)); + audit_log_format(ab, " %s=%p6", name1, addr); if (port) audit_log_format(ab, " %s=%d", name2, ntohs(port)); }