[udev] ignore entire rule when a key is unknown

[Kay Sievers]

commit 4dfe0853b64444e1c5c8f0c7564909ce7b9ed81a
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Sat Oct 22 22:06:39 2011 +0200

    ignore entire rule when a key is unknown

 ...ntire-rules-line-if-unknown-keys-are-used.patch |   26 ++++++++++++++++++++
 udev.spec                                          |    7 ++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch b/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch
new file mode 100644
index 0000000..4d9f1c6
--- /dev/null
+++ b/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch
@@ -0,0 +1,26 @@
+From 95691487363ef213fec6975219c87d29415a2479 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.sievers at vrfy.org>
+Date: Sat, 22 Oct 2011 20:50:23 +0200
+Subject: [PATCH] ignore entire rules line if unknown keys are used
+
+---
+ udev/udev-rules.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/udev/udev-rules.c b/udev/udev-rules.c
+index 75636d9..f540a5a 100644
+--- a/udev/udev-rules.c
++++ b/udev/udev-rules.c
+@@ -1612,7 +1612,9 @@ static int add_rule(struct udev_rules *rules, char *line,
+ 
+ 			continue;
+ 		}
++
+ 		err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno);
++		goto invalid;
+ 	}
+ 
+ 	/* add rule token */
+-- 
+1.7.6.4
+
diff --git a/udev.spec b/udev.spec
index a083a95..f2e24ff 100644
--- a/udev.spec
+++ b/udev.spec
@@ -1,7 +1,7 @@
 Summary:        A rule-based device node and kernel event manager
 Name:           udev
 Version:        174
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Base
 Source:         ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
@@ -25,6 +25,7 @@ Requires:       pkgconfig
 Requires:       util-linux >= 2.15.1
 Conflicts:      systemd < 37
 Conflicts:      dracut < 013-93
+Patch10:        0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch
 
 %ifarch s390 s390x
 # Require s390utils-base, because it's essential on s390
@@ -81,6 +82,7 @@ glib-based applications using libudev functionality.
 
 %prep
 %setup -q
+%patch10 -p1
 
 %build
 # prevent man pages from re-building (xmlto)
@@ -192,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Sat Oct 22 2011 Kay Sievers <kay at redhat.com> 174-2
+- ignore entire rule when a key is unknown (brc#748082)
+
 * Thu Oct 20 2011 Kay Sievers <kay at redhat.com> 174-1
 - version 174
   - path_id, usb_id, input_id tools are built-in commands