From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752850Ab1LTUbi (ORCPT ); Tue, 20 Dec 2011 15:31:38 -0500 Received: from einhorn.in-berlin.de ([192.109.42.8]:43331 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495Ab1LTUbb (ORCPT ); Tue, 20 Dec 2011 15:31:31 -0500 X-Envelope-From: stefanr@s5r6.in-berlin.de Date: Tue, 20 Dec 2011 21:31:20 +0100 From: Stefan Richter To: Stefan Richter Cc: linux1394-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Carl Karsten Subject: [PATCH 1/3] firewire: do not expose globally unique IDs in the kernel log Message-ID: <20111220213120.5e275f10@stein> In-Reply-To: <20111220213017.75ff380c@stein> References: <20111220213017.75ff380c@stein> X-Mailer: Claws Mail 3.7.10 (GTK+ 2.24.5; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Printing worldwide unique IDs in the kernel log is questionable from a privacy point of view. Some people edit such IDs out of the log before they post bug reports. Make life easier for them and do not log GUIDs anymore. For local debugging, GUIDs are still available during the lifetime of a device in /sys/bus/firewire/devices/fw*/guid. Instead, log the vendor-unique part of the device ID (the OUI) in firewire-core and bus IDs in firewire-net. Signed-off-by: Stefan Richter --- drivers/firewire/core-device.c | 8 ++++---- drivers/firewire/net.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) Index: b/drivers/firewire/core-device.c =================================================================== --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c @@ -1036,16 +1036,16 @@ static void fw_device_init(struct work_s fw_schedule_device_work(device, SHUTDOWN_DELAY); } else { if (device->config_rom_retries) - fw_notify("created device %s: GUID %08x%08x, S%d00, " + fw_notify("created device %s: OUI %06x, S%d00, " "%d config ROM retries\n", dev_name(&device->device), - device->config_rom[3], device->config_rom[4], + device->config_rom[3] >> 8, 1 << device->max_speed, device->config_rom_retries); else - fw_notify("created device %s: GUID %08x%08x, S%d00\n", + fw_notify("created device %s: OUI %06x, S%d00\n", dev_name(&device->device), - device->config_rom[3], device->config_rom[4], + device->config_rom[3] >> 8, 1 << device->max_speed); device->config_rom_retries = 0; Index: b/drivers/firewire/net.c =================================================================== --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -574,8 +574,8 @@ static int fwnet_finish_incoming_packet( spin_unlock_irqrestore(&dev->lock, flags); if (!peer) { - fw_notify("No peer for ARP packet from %016llx\n", - (unsigned long long)peer_guid); + fw_notify("No peer for ARP packet from %04x\n", + source_node_id); goto no_peer; } @@ -1545,8 +1545,8 @@ static int fwnet_probe(struct device *_d } list_add_tail(&dev->dev_link, &fwnet_device_list); - fw_notify("%s: IPv4 over FireWire on device %016llx\n", - net->name, (unsigned long long)card->guid); + fw_notify("%s: IPv4 over FireWire on card %d device %s\n", + net->name, card->index, dev_name(card->device)); have_dev: ret = fwnet_add_peer(dev, unit, device); if (ret && allocated_netdev) { -- Stefan Richter -=====-==-== ==-- =-=-- http://arcgraph.de/sr/