Received: by 2002:ac0:aa62:0:0:0:0:0 with SMTP id w31-v6csp1945710ima; Thu, 25 Oct 2018 07:23:42 -0700 (PDT) X-Google-Smtp-Source: AJdET5c2HJxdZiOnCjiXQool3cW3BelPcD5fwKnE4y9deqmD0sXAgKDBO7529VrqHC7nvD9sAJCQ X-Received: by 2002:a62:2ec3:: with SMTP id u186-v6mr1752165pfu.189.1540477422616; Thu, 25 Oct 2018 07:23:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540477422; cv=none; d=google.com; s=arc-20160816; b=U5cKfXVO5VmAIw14L8B1Wb7w/Hroc08Qw+yToBtFb02QrmfhW6lTCCFT8rq1bFsj3c pYDS/l8X0a3u3m436TCqc0SBPMJZAj7+Jp+p+sF/ZMolUofoUsiOujipWb5qtU6/jh3a 9i88jIVfdT8u2vOi0UQhoOPiDqSDGmlLPu90RJmHjAkDFqtAou1hGCJoj16HxQfOrU1k 4br2waPqdAadfQcaELYSsw5bxQkGYQrzV9Ho0oNXJSMkIZfzd4vwAp7TjqxfMGrVd4M7 K3uGSup230jdl5pnBqiI2VO9siHhIYr6LpRWSmUyl8qFYhtoE7p7cLI4Nqm6GVwgh6PQ SXzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=+353MuVG2tZrlpUUqLbCbJC5VNIrd5hDy7jBj22Nzv8=; b=i5sjVDU/tjrM+aClxYpTuN3meZi1gIxzsAtt3kCHFILfgfEWdGTQn5rcf3iSyMNc7S waY3lEBp0kODsUVev8i+Rmg+25SngiK8jSBDsWifoWxmRewE8sAtWBzo5uyq90jYe82J lPzAjyin2CboVvmAroE5CGRVxKAxEa90qmOa+Gc5Xv1J3Z2A3BvW+X7Wq3Ko18/2cOLS I/1ktKf4ZL1G8CQGjVbQMmAW2BvddE9xHV5VlVB2eq8Xa6Dsu0uTBjxA9zRB2EwhUOhh Byvh8HEBJ4o3p5RTrv+auGHP3NfK+dh2twoJZzVJwQex9O+s/V07hRXMMmqkKAZHXR+K BUWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AYTONtTJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e3-v6si8321213pga.369.2018.10.25.07.22.56; Thu, 25 Oct 2018 07:23:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AYTONtTJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730789AbeJYWzD (ORCPT + 99 others); Thu, 25 Oct 2018 18:55:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:37070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731424AbeJYWyM (ORCPT ); Thu, 25 Oct 2018 18:54:12 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 368B5208A3; Thu, 25 Oct 2018 14:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540477274; bh=plAOqDmWlF7LJqEBRBTkkraJ5ziieA5Oh382i/xO0TU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AYTONtTJLXgBuJVOeNb9LFACGZqgOQIbVHDNE6Hn6AaI18JKyh9tnip+nuHsJGKuT osgeqzik1SQw95hr24o7QZZb2XXGhXDFZBYrLp65xXN5JIKHN9vzthL9pVZ5I+ND5G KaCFrAXZaxpovsf8oSag7w0C+nIZBiZd8ZzTbWo0= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Xin Long , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL 3.18 90/98] sctp: translate network order to host order when users get a hmacid Date: Thu, 25 Oct 2018 10:18:45 -0400 Message-Id: <20181025141853.214051-90-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141853.214051-1-sashal@kernel.org> References: <20181025141853.214051-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xin Long [ Upstream commit 7a84bd46647ff181eb2659fdc99590e6f16e501d ] Commit ed5a377d87dc ("sctp: translate host order to network order when setting a hmacid") corrected the hmacid byte-order when setting a hmacid. but the same issue also exists on getting a hmacid. We fix it by changing hmacids to host order when users get them with getsockopt. Fixes: Commit ed5a377d87dc ("sctp: translate host order to network order when setting a hmacid") Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sctp/socket.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 13693d0adeaf..5c16d0e13987 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -5607,6 +5607,7 @@ static int sctp_getsockopt_hmac_ident(struct sock *sk, int len, struct sctp_hmac_algo_param *hmacs; __u16 data_len = 0; u32 num_idents; + int i; if (!ep->auth_enable) return -EACCES; @@ -5624,8 +5625,12 @@ static int sctp_getsockopt_hmac_ident(struct sock *sk, int len, return -EFAULT; if (put_user(num_idents, &p->shmac_num_idents)) return -EFAULT; - if (copy_to_user(p->shmac_idents, hmacs->hmac_ids, data_len)) - return -EFAULT; + for (i = 0; i < num_idents; i++) { + __u16 hmacid = ntohs(hmacs->hmac_ids[i]); + + if (copy_to_user(&p->shmac_idents[i], &hmacid, sizeof(__u16))) + return -EFAULT; + } return 0; } -- 2.17.1