From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F127DC3A5A2 for ; Tue, 10 Sep 2019 07:15:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C426A2084D for ; Tue, 10 Sep 2019 07:15:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730830AbfIJHPj (ORCPT ); Tue, 10 Sep 2019 03:15:39 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:54562 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726192AbfIJHPj (ORCPT ); Tue, 10 Sep 2019 03:15:39 -0400 Received: from [88.214.186.143] (helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1i7aN7-00040c-IV; Tue, 10 Sep 2019 03:15:36 -0400 Date: Tue, 10 Sep 2019 03:15:21 -0400 From: Neil Horman To: Xin Long Cc: network dev , linux-sctp@vger.kernel.org, davem@davemloft.net, Marcelo Ricardo Leitner Subject: Re: [PATCH net] sctp: fix the missing put_user when dumping transport thresholds Message-ID: <20190910071521.GA31884@localhost.localdomain> References: <3fa4f7700c93f06530c80bc666d1696cb7c077de.1568014409.git.lucien.xin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3fa4f7700c93f06530c80bc666d1696cb7c077de.1568014409.git.lucien.xin@gmail.com> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Sep 09, 2019 at 03:33:29PM +0800, Xin Long wrote: > This issue causes SCTP_PEER_ADDR_THLDS sockopt not to be able to dump > a transport thresholds info. > > Fix it by adding 'goto' put_user in sctp_getsockopt_paddr_thresholds. > > Fixes: 8add543e369d ("sctp: add SCTP_FUTURE_ASSOC for SCTP_PEER_ADDR_THLDS sockopt") > Signed-off-by: Xin Long > --- > net/sctp/socket.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/sctp/socket.c b/net/sctp/socket.c > index 9d1f83b..ad87518 100644 > --- a/net/sctp/socket.c > +++ b/net/sctp/socket.c > @@ -7173,7 +7173,7 @@ static int sctp_getsockopt_paddr_thresholds(struct sock *sk, > val.spt_pathmaxrxt = trans->pathmaxrxt; > val.spt_pathpfthld = trans->pf_retrans; > > - return 0; > + goto out; > } > > asoc = sctp_id2assoc(sk, val.spt_assoc_id); > @@ -7191,6 +7191,7 @@ static int sctp_getsockopt_paddr_thresholds(struct sock *sk, > val.spt_pathmaxrxt = sp->pathmaxrxt; > } > > +out: > if (put_user(len, optlen) || copy_to_user(optval, &val, len)) > return -EFAULT; > > -- > 2.1.0 > > Acked-by: Neil Horman