linux-kernel - 2.6.23-rc7-mm1: fix generic

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20070924130957.GE6757@localhost.sw.ru>
Date:	Mon, 24 Sep 2007 17:09:57 +0400
From:	Alexey Dobriyan <adobriyan@...ru>
To:	akpm@...l.org, kamalesh@...ux.vnet.ibm.com
Cc:	linux-kernel@...r.kernel.org, xemul@...ru
Subject: 2.6.23-rc7-mm1: fix generic_setlease() mismerge

Please, try this:

--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1373,11 +1373,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
 	if (new_fl == NULL)
 		goto out;
 
-	error = -ENOMEM;
-	new_fl = locks_alloc_lock();
-	if (new_fl == NULL)
-		goto out;
-
 	/*
 	 * At this point, we know that if there is an exclusive
 	 * lease on this file, then we hold it on this filp

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/