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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 A6B6CC43331 for ; Mon, 11 Nov 2019 18:30:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 757332190F for ; Mon, 11 Nov 2019 18:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497017; bh=/6P89LKFLnV4atW4E8l4Q+dc5K4YUqiskhCGJJztcIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HubsSr0zQzX6K7ROW4qvPuBMcnDyHedaaXprinbGdBmvJBYd5e9Gs+4iDO6+RoTR/ 7UZBuzfy02q4yolWUjfCYvTJ+t7x3EcaqMzOtDmWQMRzz2mR4nozhLcSzFsU6seeCO WnmVA0wdYI8dWz0qlGzEs0flgTrn8PzO/AUq8LJw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727208AbfKKSaQ (ORCPT ); Mon, 11 Nov 2019 13:30:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:46522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbfKKSaP (ORCPT ); Mon, 11 Nov 2019 13:30:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 74D86214E0; Mon, 11 Nov 2019 18:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497015; bh=/6P89LKFLnV4atW4E8l4Q+dc5K4YUqiskhCGJJztcIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y7+XGVwGSOeKCARDsNX+i8MT/vNNtf7o1No53RjdzZy9iv+0KMGuDNtTqqRl8Ssl3 a1Co835krVbSUPkCuvU+C067194zZWGFOAI9DEBRvAWB4skrMM+YR34A0ZDxk/89hC JhM8Beiq+fO0wdw330x9UjJ1wei9cpLwMGdoxVK8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Jozsef Kadlecsik Subject: [PATCH 4.4 17/43] netfilter: ipset: Fix an error code in ip_set_sockfn_get() Date: Mon, 11 Nov 2019 19:28:31 +0100 Message-Id: <20191111181307.797092015@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181246.772983347@linuxfoundation.org> References: <20191111181246.772983347@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter commit 30b7244d79651460ff114ba8f7987ed94c86b99a upstream. The copy_to_user() function returns the number of bytes remaining to be copied. In this code, that positive return is checked at the end of the function and we return zero/success. What we should do instead is return -EFAULT. Fixes: a7b4f989a629 ("netfilter: ipset: IP set core support") Signed-off-by: Dan Carpenter Signed-off-by: Jozsef Kadlecsik Signed-off-by: Greg Kroah-Hartman --- net/netfilter/ipset/ip_set_core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -1930,8 +1930,9 @@ ip_set_sockfn_get(struct sock *sk, int o } req_version->version = IPSET_PROTOCOL; - ret = copy_to_user(user, req_version, - sizeof(struct ip_set_req_version)); + if (copy_to_user(user, req_version, + sizeof(struct ip_set_req_version))) + ret = -EFAULT; goto done; } case IP_SET_OP_GET_BYNAME: { @@ -1988,7 +1989,8 @@ ip_set_sockfn_get(struct sock *sk, int o } /* end of switch(op) */ copy: - ret = copy_to_user(user, data, copylen); + if (copy_to_user(user, data, copylen)) + ret = -EFAULT; done: vfree(data);