linux-hotplug.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
To: linux-hotplug@vger.kernel.org
Subject: udevd: fix termination of rule execution
Date: Sat, 01 Nov 2008 16:09:16 +0000	[thread overview]
Message-ID: <490C7F2C.1030802@tuffmail.co.uk> (raw)

LAST_RULE was broken, and I broke TK_END by making it do the same.
It used a "break" which exited the switch statement, but not the loop!

=2953= Invalid read of size 4                                                                               
=2953=    at 0x4081EE: dump_token (udev-rules.c:859)                                                        
=2953=    by 0x40BADB: udev_rules_apply_to_event (udev-rules.c:1849)                                        
=2953=    by 0x403F17: udev_event_execute_rules (udev-event.c:554)                                          
=2953=    by 0x418626: main (test-udev.c:100)                                                               
=2953=  Address 0x55ab1f8 is 0 bytes after a block of size 80 alloc'd                                       
=2953=    at 0x4C23082: realloc (vg_replace_malloc.c:429)                                                   
=2953=    by 0x40B13B: udev_rules_new (udev-rules.c:1670)                                                   
=2953=    by 0x418536: main (test-udev.c:84)                                                                
...

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index f6cc45b..77029f7 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -2319,7 +2319,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			continue;
 		case TK_A_LAST_RULE:
 		case TK_END:
-			break;
+			return 0;
 
 		case TK_M_PARENTS_MAX:
 		case TK_M_MAX:
@@ -2334,9 +2334,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 		/* fast-forward to next rule */
 		idx = rule->rule.next_rule;
 		if (idx = 0)
-			break;
+			return 0;
 		dbg(rules->udev, "forward to rule: %u\n", idx);
 		cur = &rules->tokens[idx];
 	}
-	return 0;
 }



             reply	other threads:[~2008-11-01 16:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-01 16:09 Alan Jenkins [this message]
2008-11-01 16:35 ` udevd: fix termination of rule execution Kay Sievers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=490C7F2C.1030802@tuffmail.co.uk \
    --to=alan-jenkins@tuffmail.co.uk \
    --cc=linux-hotplug@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).