## Automatically generated incremental diff
## From:   linux-2.0.40-rc2
## To:     linux-2.0.40-rc3
## Robot:  $Id: make-incremental-diff,v 1.9 2001/12/10 00:06:56 hpa Exp $

diff -urN linux-2.0.40-rc2/net/unix/af_unix.c linux/net/unix/af_unix.c
--- linux-2.0.40-rc2/net/unix/af_unix.c	Thu Feb 14 02:06:20 2002
+++ linux/net/unix/af_unix.c	Thu Feb 14 02:06:21 2002
@@ -31,6 +31,9 @@
  *		Alan Cox	:	Shutdown() bug
  *	Michael Deutschmann	:	release was writing to the socket
  *					structure after freeing it.
+ *		Jon Nelson,
+ *		Alan Cox,
+ *		David Weinehall	:	Fix possible memory-leaks
  *
  * Known differences from reference BSD that was tested:
  *
@@ -973,7 +976,11 @@
 		{
 			int err=unix_attach_fds(fpnum,fp,skb);
 			if(err)
+			{
+				unix_fd_free(sk, fp, fpnum);
+				kfree(skb);
 				return err;
+			}
 			fpnum=0;
 		}
 		else
