tpm: fix misc name memory problem
PATCH 1/1 tpm: fix misc name memory problem
I was using invalid memory for the miscdevice.name. This patch fixes the problem which was manifested by an ugly entry in /proc/misc.
Signed-off-by Kylene Hall <[email protected]>
---
Index: drivers/char/tpm/tpm.c
===================================================================
RCS file: /cvsroot/tpmdd/tpmdd/drivers/char/tpm/tpm.c,v retrieving revision 1.28
drivers/char/tpm/tpm.c +6 -2
@@ -488,6 +497,7 @@ void __devexit tpm_remove(struct pci_devpci_set_drvdata (pci_dev,NULL );misc_deregister (&chip->vendor->miscdev); +kfree (&chip->vendor->miscdev.name);sysfs_remove_group (&pci_dev->dev.kobj, chip->vendor->attr_group);
@@ -551,7 +561,9 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume);int tpm_register_hardware (struct pci_dev *pci_dev,struct tpm_vendor_specific *entry) { -char devname[7 ]; +#define DEVNAME_SIZE 7 + +char *devname;struct tpm_chip *chip;int i, j;
@@ -594,7 +606,8 @@ dev_num_search_complete:else chip->vendor->miscdev.minor =MISC_DYNAMIC_MINOR ; -snprintf (devname,sizeof (devname),"%s%d" ,"tpm" , chip->dev_num); + devname =kmalloc (DEVNAME_SIZE ,GFP_KERNEL ); +scnprintf (devname,DEVNAME_SIZE ,"%s%d" ,"tpm" , chip->dev_num); chip->vendor->miscdev.name = devname; chip->vendor->miscdev.dev = &(pci_dev->dev);