This changes the uevent buffer functions to use a struct instead of a long list of parameters. It does no longer require the caller to do the proper buffer termination and size accounting, which is currently wrong in some places. It fixes a known bug where parts of the uevent environment are overwritten because of wrong index calculations. Many thanks to Mathieu Desnoyers for finding bugs and improving the error handling. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
		
			
				
	
	
		
			37 lines
		
	
	
	
		
			926 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			37 lines
		
	
	
	
		
			926 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
#include <linux/kernel.h>
 | 
						|
#include <linux/pci.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include "pci.h"
 | 
						|
 | 
						|
int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
 | 
						|
{
 | 
						|
	struct pci_dev *pdev;
 | 
						|
 | 
						|
	if (!dev)
 | 
						|
		return -ENODEV;
 | 
						|
 | 
						|
	pdev = to_pci_dev(dev);
 | 
						|
	if (!pdev)
 | 
						|
		return -ENODEV;
 | 
						|
 | 
						|
	if (add_uevent_var(env, "PCI_CLASS=%04X", pdev->class))
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	if (add_uevent_var(env, "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	if (add_uevent_var(env, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
 | 
						|
			   pdev->subsystem_device))
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	if (add_uevent_var(env, "PCI_SLOT_NAME=%s", pci_name(pdev)))
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	if (add_uevent_var(env, "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
 | 
						|
			   pdev->vendor, pdev->device,
 | 
						|
			   pdev->subsystem_vendor, pdev->subsystem_device,
 | 
						|
			   (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
 | 
						|
			   (u8)(pdev->class)))
 | 
						|
		return -ENOMEM;
 | 
						|
	return 0;
 | 
						|
}
 |