From patchwork Wed Aug 26 21:03:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 511055 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B3AFF140332 for ; Thu, 27 Aug 2015 07:03:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=GCWaz1MM; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752471AbbHZVD2 (ORCPT ); Wed, 26 Aug 2015 17:03:28 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33327 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750832AbbHZVD1 (ORCPT ); Wed, 26 Aug 2015 17:03:27 -0400 Received: by pacti10 with SMTP id ti10so99676437pac.0 for ; Wed, 26 Aug 2015 14:03:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=/LLvqtk9tXraA/LNvFNiCO9n1RNlbSyej/IMWN0R49I=; b=GCWaz1MMVVo4QAn2O5dX6R5pmDTRFGIcytHhCASyk8hTtwe5SbTlv84LdRaMQ56m8m 2ShfdCm37nY6r0KzrrJcvunVrNAIuRb5qhfoVREDvy2g7CBZ3AYPnzO1t9x9X0PpTKjj LHRX9+rOuFtTT8gbIT0j+tlo+Wae/USb9PIUmsTwftsXwUjIQ+SvS0+Y8Lk3kvXMm/vr 82HmXFBAJQwSrKbiE2spIloirDa96OjuyyUPuq/zhW8SYoFbNaM6YdnWH4Wu0WJcku4R FwjZBFFHuMLH736Dk08BO+SNTcRm2OPDaQd1ZGS9DH5hvvk5igjX56PmrXET2gAcRIVM LeaA== X-Received: by 10.68.57.170 with SMTP id j10mr1034641pbq.56.1440623007387; Wed, 26 Aug 2015 14:03:27 -0700 (PDT) Received: from localhost (138.128.208.20.16clouds.com. [138.128.208.20]) by smtp.gmail.com with ESMTPSA id df2sm19328581pad.19.2015.08.26.14.03.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Aug 2015 14:03:26 -0700 (PDT) From: Xin Long To: network dev Cc: mleitner@redhat.com, davem@davemloft.net, vyasevic@redhat.com Subject: [PATCH net v4] sctp: asconf's process should verify address parameter is in the beginning Date: Thu, 27 Aug 2015 05:03:24 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org in sctp_process_asconf(), we get address parameter from the beginning of the addip params. but we never check if it's really there. if the addr param is not there, it still can pass sctp_verify_asconf(), then to be handled by sctp_process_asconf(), it will not be safe. so add detection in sctp_verify_asconf() to check the address parameter is in the beginning, or return false to send abort. Signed-off-by: Xin Long Signed-off-by: Vlad Yasevich Acked-by: Vlad Yasevich --- net/sctp/sm_make_chunk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 06320c8..f3fc881 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -3132,12 +3132,14 @@ bool sctp_verify_asconf(const struct sctp_association *asoc, case SCTP_PARAM_IPV4_ADDRESS: if (length != sizeof(sctp_ipv4addr_param_t)) return false; - addr_param_seen = true; + if (param.v == addip->addip_hdr.params) + addr_param_seen = true; break; case SCTP_PARAM_IPV6_ADDRESS: if (length != sizeof(sctp_ipv6addr_param_t)) return false; - addr_param_seen = true; + if (param.v == addip->addip_hdr.params) + addr_param_seen = true; break; case SCTP_PARAM_ADD_IP: case SCTP_PARAM_DEL_IP: