From patchwork Mon Dec 24 16:30:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Pakki X-Patchwork-Id: 1018263 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="EhR60JPm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Nl8V1xRLz9sCQ for ; Tue, 25 Dec 2018 03:30:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725819AbeLXQa3 (ORCPT ); Mon, 24 Dec 2018 11:30:29 -0500 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:49082 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725747AbeLXQa3 (ORCPT ); Mon, 24 Dec 2018 11:30:29 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id A9930BC6 for ; Mon, 24 Dec 2018 16:30:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zqOK2DQuyoma for ; Mon, 24 Dec 2018 10:30:27 -0600 (CST) Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 7C9CF6BA for ; Mon, 24 Dec 2018 10:30:27 -0600 (CST) Received: by mail-io1-f69.google.com with SMTP id r7so832807iom.22 for ; Mon, 24 Dec 2018 08:30:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=uNbUeFfSrqBQ2BTzg6nlG6ILKKMJrGz3o7ZvBgnL6lY=; b=EhR60JPm2IfyisT4wiCVF8GrefK2eJSXYHKiHBRf867NxS4Ganu4u5uziCvYTOlw3U QS+t1Z6gj7LTJSP9V5nIVpP2hQgizvzZdnLg3cg+FXLHa1ptSjam3BI64hy8irjlCFiI jN7ScggyOmL+vLxrhh9uVIqy1bWAO/Bdp2ncDNCkdX5rL6fhyzIxh4pVmivYqWU95g+X O+ryScBpBOQmZ5FYNqB1upRRZA/zoNtU1jUh0N5E5isqi9Tkeur+HPHr8jjThWuGVn0q wYJjPzR6ux8yDyW2GuNGBLisj5ASu+uO+UsmGbASAMBLrQhP64mmFjwLBwqN/KNlClhP ztdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uNbUeFfSrqBQ2BTzg6nlG6ILKKMJrGz3o7ZvBgnL6lY=; b=lv1Oid9nuNxIAuYnncvcO6JNe8PnFAWuGbsCg8NxY+3//17HVtiQ6x3MVnYo24sLot d4YRHxpNPA0naZ2Cvjx4Otnhk+AKi8JR/XVqxrshmm0yu3XWcUuBQZmKWl3fEaSJQtYO Aq44iQawAbAOBXRaRHqHUkWFHsy1eLWQAmZT3NTUldacDbfgyq2j1LBxLROonZwYM1op G3S+vNYycErqaDFXtBypV7Qns1hLCWRL94x/uiFVyOKgW2XE3Cfq/t+uRk88M6BtI7Fp nu1eCIPJZh3DHUrLPcJ5GHYxaJhL48YAn2Hg3a2SIlJHVd5yN7S2dDNq6PX2/cVucAc7 QpGQ== X-Gm-Message-State: AA+aEWZCFQKPSDFoEpBEn1rNdtsWOfAxWYH6V2zuTRPvS0kNVcXJmtV5 tuKMJkOqQGNftm2IANRo5u1pkXXYe71HIRvtfDzOkjzwevfX3sgBfgyCVs+RJt1dgfYK8Vg3ETa HLUTOjRyv8jJ3x676XiUp X-Received: by 2002:a24:af0a:: with SMTP id t10mr9738786ite.159.1545669027066; Mon, 24 Dec 2018 08:30:27 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uok4bxt2k6hzQiz2a1qed/lGbzdAZKKkuDPuglmdMVUQC4NWkL3RlE8FT8J9qcczB/C74YuQ== X-Received: by 2002:a24:af0a:: with SMTP id t10mr9738772ite.159.1545669026814; Mon, 24 Dec 2018 08:30:26 -0800 (PST) Received: from cs-u-syssec1.cs.umn.edu (cs-u-syssec1.cs.umn.edu. [134.84.121.78]) by smtp.gmail.com with ESMTPSA id x99sm10493792ita.23.2018.12.24.08.30.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Dec 2018 08:30:26 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ipv6/route: Add a missing check on proc_dointvec Date: Mon, 24 Dec 2018 10:30:17 -0600 Message-Id: <20181224163017.17362-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While flushing the cache via ipv6_sysctl_rtcache_flush(), the call to proc_dointvec() may fail. The fix adds a check that returns the error, on failure. Signed-off-by: Aditya Pakki --- net/ipv6/route.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 059f0531f7c1..5ccdaa27ec53 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5053,12 +5053,16 @@ int ipv6_sysctl_rtcache_flush(struct ctl_table *ctl, int write, { struct net *net; int delay; + int ret; if (!write) return -EINVAL; net = (struct net *)ctl->extra1; delay = net->ipv6.sysctl.flush_delay; - proc_dointvec(ctl, write, buffer, lenp, ppos); + ret = proc_dointvec(ctl, write, buffer, lenp, ppos); + if (ret) + return ret; + fib6_run_gc(delay <= 0 ? 0 : (unsigned long)delay, net, delay > 0); return 0; }