From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH] scsi: ses check name in enclosure_component_register -v2 Date: Thu, 30 Apr 2009 19:13:41 -0700 Message-ID: <49FA5AD5.3070804@kernel.org> References: <49F6678D.3080207@kernel.org> <1240957589.3380.67.camel@mulgrave.int.hansenpartnership.com> <49F7979A.8040302@kernel.org> <1240964289.3380.73.camel@mulgrave.int.hansenpartnership.com> <49F7A71F.5040709@kernel.org> <20090429020331.GF21648@parisc-linux.org> <49F7CA9A.5000701@kernel.org> <20090429110846.GG21648@parisc-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from hera.kernel.org ([140.211.167.34]:39536 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752900AbZEACOr (ORCPT ); Thu, 30 Apr 2009 22:14:47 -0400 In-Reply-To: <20090429110846.GG21648@parisc-linux.org> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Matthew Wilcox Cc: James Bottomley , Andrew Morton , Kay Sievers , Greg KH , "linux-kernel@vger.kernel.org" , Linux-Scsi dev_set_name will use sprintf to copy the name. need to check if the name does valid. otherwise will error from device_add later. v2: add %s in dev_set_name according to James Signed-off-by: Yinghai Lu --- drivers/misc/enclosure.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6/drivers/misc/enclosure.c =================================================================== --- linux-2.6.orig/drivers/misc/enclosure.c +++ linux-2.6/drivers/misc/enclosure.c @@ -119,7 +119,7 @@ enclosure_register(struct device *dev, c edev->edev.class = &enclosure_class; edev->edev.parent = get_device(dev); edev->cb = cb; - dev_set_name(&edev->edev, name); + dev_set_name(&edev->edev, "%s", name); err = device_register(&edev->edev); if (err) goto err; @@ -255,8 +255,8 @@ enclosure_component_register(struct encl ecomp->number = number; cdev = &ecomp->cdev; cdev->parent = get_device(&edev->edev); - if (name) - dev_set_name(cdev, name); + if (name && name[0]) + dev_set_name(cdev, "%s", name); else dev_set_name(cdev, "%u", number);