[udev] fix for apply_format()

[udev] fix for apply_format()

[Kay Sievers]

[-- Attachment #1: Type: text/plain, Size: 97 bytes --]


fix possible NULL pointer in '%c' callout substitution
and cleanup '%D' debug text

thanks,
Kay

[-- Attachment #2: 07-apply_format-bug.diff --]
[-- Type: text/plain, Size: 903 bytes --]

diff -Nru a/namedev.c b/namedev.c
--- a/namedev.c	Fri Dec 26 02:07:55 2003
+++ b/namedev.c	Fri Dec 26 02:07:55 2003
@@ -200,11 +200,12 @@
 			case 'D':
 				if (strlen(udev->kernel_number) == 0) {
 					strcat(pos, "disc");
+					dbg("substitute devfs disc");
 					break;
 				}
 				strcat(pos, "part");
 				strcat(pos, udev->kernel_number);
-				dbg("substitute kernel number '%s'", udev->kernel_number);
+				dbg("substitute devfs part '%s'", udev->kernel_number);
 				break;
 			case 'm':
 				sprintf(pos, "%u", udev->minor);
@@ -229,8 +230,10 @@
 							break;
 						}
 					}
-					strcat(pos, pos3);
-					dbg("substitute partial callout output '%s'", pos3);
+					if (pos3) {
+						strcat(pos, pos3);
+						dbg("substitute partial callout output '%s'", pos3);
+					}
 				} else {
 					strcat(pos, udev->callout_value);
 					dbg("substitute callout output '%s'", udev->callout_value);

Re: [udev] fix for apply_format()

[Greg KH]

On Fri, Dec 26, 2003 at 02:37:37AM +0100, Kay Sievers wrote:
> 
> fix possible NULL pointer in '%c' callout substitution
> and cleanup '%D' debug text

Applied, thanks.

greg k-h


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel