- dmi-fix-gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     drivers/firmware/dmi-id.c: fix overflow
has been removed from the -mm tree.  Its filename was
     dmi-fix-gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct.patch

This patch was dropped because an updated version will be merged

------------------------------------------------------
Subject: drivers/firmware/dmi-id.c: fix overflow
From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>

Cc: Kay Sievers <kay.sievers@xxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/firmware/dmi-id.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -puN drivers/firmware/dmi-id.c~dmi-fix-gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct drivers/firmware/dmi-id.c
--- a/drivers/firmware/dmi-id.c~dmi-fix-gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct
+++ a/drivers/firmware/dmi-id.c
@@ -152,9 +152,10 @@ static int dmi_dev_uevent(struct device 
 	if (add_uevent_var(env, "MODALIAS="))
 		return -ENOMEM;
 	len = get_modalias(&env->buf[env->buflen - 1],
-			   sizeof(env->buf) - env->buflen);
-	if (len >= (sizeof(env->buf) - env->buflen))
+			   sizeof(env->buf) - (env->buflen - 1));
+	if (len >= (sizeof(env->buf) - (env->buflen - 1)))
 		return -ENOMEM;
+	env->buflen += len + 1;
 	return 0;
 }
 
_

Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are

origin.patch
powerpc-include-pagemaph-in-asm-powerpc-tlbh.patch
dmi-fix-gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct.patch
sysfs-crash-debugging.patch
fix-f_version-type-should-be-u64-instead-of-unsigned-long.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux