9deb373671
This patch includes the update of patch upstream status of the following recipes (50 in all): grub pciutils setserial dhcp iproute2 libnss-mdns nfs-utils openssl portmap busybox coreutils dbus dropbear ncurses readline sysfsutils sysvinit tinylogin udev update-rc.d util-linux elfutils file pkgconfig syslinux ubootchart yaffs2 findutils gamin hdparm libaio libzypp parted procps sat-solver screen sed sysklogd tcp-wrapper time zypper attr boost createrepo gnutls hal js libgcrypt libnl libusb-compat (From OE-Core rev: 1e6f767663b7d5fb6277fd2b214f4a50e24d4ffd) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
27 lines
729 B
Diff
27 lines
729 B
Diff
Upstream-Status: Pending
|
|
|
|
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
|
|
--- a/udev_rules_parse.c
|
|
+++ b/udev_rules_parse.c
|
|
@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule
|
|
int valid;
|
|
char *linepos;
|
|
char *attr;
|
|
+ size_t padding;
|
|
int retval;
|
|
|
|
/* get all the keys */
|
|
@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule
|
|
|
|
/* grow buffer and add rule */
|
|
rule_size = sizeof(struct udev_rule) + rule->bufsize;
|
|
+ padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
|
|
+ dbg("add %zi padding bytes", padding);
|
|
+ rule_size += padding;
|
|
+ rule->bufsize += padding;
|
|
+
|
|
rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
|
|
if (!rules->buf) {
|
|
err("realloc failed");
|
|
|