Merge branch 'linus' into sched/urgent

2 files changed, 5 insertions, 13 deletions

diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index e4e2caeb9d82..086d5ef098fd 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -371,9 +371,8 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
         line = tty->index;
-        if ((line < 0) || (line >= IRCOMM_TTY_PORTS)) {
+        if (line >= IRCOMM_TTY_PORTS)
                 return -ENODEV;
-        }
 
         /* Check if instance already exists */
         self = hashbin_lock_find(ircomm_tty, line, NULL);
@@ -405,6 +404,8 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
                  * Force TTY into raw mode by default which is usually what
                  * we want for IrCOMM and IrLPT. This way applications will
                  * not have to twiddle with printcap etc.
+                 *
+                 * Note this is completely usafe and doesn't work properly
                  */
                 tty->termios->c_iflag = 0;
                 tty->termios->c_oflag = 0;
diff --git a/net/socket.c b/net/socket.c
index 2c730fc718ab..06603d73c411 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1313,13 +1313,7 @@ asmlinkage long sys_socketpair(int family, int type, int protocol,
                 goto out_fd1;
         }
 
-        err = audit_fd_pair(fd1, fd2);
-        if (err < 0) {
-                fput(newfile1);
-                fput(newfile2);
-                goto out_fd;
-        }
-
+        audit_fd_pair(fd1, fd2);
         fd_install(fd1, newfile1);
         fd_install(fd2, newfile2);
         /* fd1 and fd2 may be already another descriptors.
@@ -1349,7 +1343,6 @@ out_fd2:
 out_fd1:
         put_filp(newfile2);
         sock_release(sock2);
-out_fd:
         put_unused_fd(fd1);
         put_unused_fd(fd2);
         goto out;
@@ -2065,9 +2058,7 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
         if (copy_from_user(a, args, nargs[call]))
                 return -EFAULT;
 
-        err = audit_socketcall(nargs[call] / sizeof(unsigned long), a);
-        if (err)
-                return err;
+        audit_socketcall(nargs[call] / sizeof(unsigned long), a);
 
         a0 = a[0];
         a1 = a[1];