rpms/kernel/F-12 cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch, 1.1, 1.2

Chuck Ebbert cebbert at fedoraproject.org
Sat Jul 24 05:04:23 UTC 2010


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24615

Modified Files:
	cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch 
Log Message:
fix up cifs patch for 2.6.32

cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch:
 cifsfs.c      |    6 ++--
 dns_resolve.c |   70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 dns_resolve.h |    4 +--
 3 files changed, 75 insertions(+), 5 deletions(-)

Index: cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch	22 Jul 2010 21:44:42 -0000	1.1
+++ cifs-fix-malicious-redirect-problem-in-the-dns-lookup-code.patch	24 Jul 2010 05:04:22 -0000	1.2
@@ -82,10 +82,11 @@ diff --git a/fs/cifs/dns_resolve.c b/fs/
 index 4db2c5e..49315cb 100644
 --- a/fs/cifs/dns_resolve.c
 +++ b/fs/cifs/dns_resolve.c
-@@ -24,12 +24,16 @@
+@@ -24,12 +24,17 @@
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
  
++#include <linux/slab.h>
 +#include <linux/keyctl.h>
 +#include <linux/key-type.h>
  #include <keys/user-type.h>
@@ -99,7 +100,7 @@ index 4db2c5e..49315cb 100644
  /* Checks if supplied name is IP address
   * returns:
   * 		1 - name is IP
-@@ -94,6 +98,7 @@ struct key_type key_type_dns_resolver = {
+@@ -94,6 +99,7 @@ struct key_type key_type_dns_resolver = {
  int
  dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
  {
@@ -107,7 +108,7 @@ index 4db2c5e..49315cb 100644
  	int rc = -EAGAIN;
  	struct key *rkey = ERR_PTR(-EAGAIN);
  	char *name;
-@@ -133,8 +138,15 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
+@@ -133,8 +139,15 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
  		goto skip_upcall;
  	}
  
@@ -123,7 +124,7 @@ index 4db2c5e..49315cb 100644
  		len = rkey->type_data.x[0];
  		data = rkey->payload.data;
  	} else {
-@@ -165,4 +177,61 @@ out:
+@@ -165,4 +178,61 @@ out:
  	return rc;
  }
  



More information about the scm-commits mailing list