Commit 66e2d3e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Two small cifs fixes"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  fs/cifs/cifs_dfs_ref.c: fix potential memory leakage
  cifs: fix srcip_matches() for ipv6
parents d93816a6 10b8c7df

fs/cifs/cifs_dfs_ref.c

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ char *cifs_compose_mount_options(const char *sb_mountdata, 
compose_mount_options_err:

	kfree(mountdata);

	mountdata = ERR_PTR(rc);

	kfree(*devname);

	*devname = NULL;

	goto compose_mount_options_out;

}

fs/cifs/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -1917,7 +1917,7 @@ srcip_matches(struct sockaddr *srcaddr, struct sockaddr *rhs) 
	}

	case AF_INET6: {

		struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr;

		struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)&rhs;

		struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)rhs;

		return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr);

	}

	default: