From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932611Ab1ELTTR (ORCPT ); Thu, 12 May 2011 15:19:17 -0400 Received: from mail.perches.com ([173.55.12.10]:1571 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932544Ab1ELTTO (ORCPT ); Thu, 12 May 2011 15:19:14 -0400 From: Joe Perches To: Vlad Yasevich , Sridhar Samudrala Cc: "David S. Miller" , linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] sctp: sctp_sendmsg: Don't test known non-null sinfo Date: Thu, 12 May 2011 12:19:10 -0700 Message-Id: X-Mailer: git-send-email 1.7.5.rc3.dirty In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's already known non-null above. Signed-off-by: Joe Perches --- net/sctp/socket.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index a5d3560..10ebcd7 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1793,12 +1793,10 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, goto out_free; } - if (sinfo) { - /* Check for invalid stream. */ - if (sinfo->sinfo_stream >= asoc->c.sinit_num_ostreams) { - err = -EINVAL; - goto out_free; - } + /* Check for invalid stream. */ + if (sinfo->sinfo_stream >= asoc->c.sinit_num_ostreams) { + err = -EINVAL; + goto out_free; } timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT); -- 1.7.5.rc3.dirty