From patchwork Fri Jul 26 02:25:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 1137191 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tH76H4nw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45vtGz3Jsnz9sBZ for ; Fri, 26 Jul 2019 12:25:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726271AbfGZCZm (ORCPT ); Thu, 25 Jul 2019 22:25:42 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:42078 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbfGZCZm (ORCPT ); Thu, 25 Jul 2019 22:25:42 -0400 Received: by mail-pg1-f193.google.com with SMTP id t132so23965725pgb.9; Thu, 25 Jul 2019 19:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RwZ2nd8NIwVXWFl0thI1mUWG1z6BKwyLh5lPqCVMwKM=; b=tH76H4nwDR85gZNHeXv1/06vCvS8hZ5OqjDFn4E9apHKav+ipxtGHLryKB/NLw6L88 TL1JxapU5uO33p1dI67q7qGAXpvrfJZj0QvQE2YdctalkuSc647eL9woHMqO9OnoRYpJ jQSbzSPrJiYYVWQU2PNvgMwruMfCpMUH0LZXhDPQP0OhTxCJS3NrvNWTjDsjojjC0CKl dygRM51arGRIXSgqZH3YXxBGqB5/xcTMZofwTpGIA3qEKn7XW64IM9K5Xwj0Fe2aktrD OfEdcg8wlZH8Xmr3nFwv1FSfSRj6PoKjVRTyPlF0WQUdoxH49dC7AhhLqaJTVLHS1jAq sQPw== 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=RwZ2nd8NIwVXWFl0thI1mUWG1z6BKwyLh5lPqCVMwKM=; b=aqXC3z/Z9S+jTc0chj4D5ib7LIBt00ZqQ/SxJnVyFa7aPz0a4ylHuAhQ6wIEl8H0pt 9DI/543OpzisTfbCC9M3oNNKZfdJfipHK5nSk+w0evpe9A8jeTKOCpVNA5uauti7H7OR BjjuMNfmqX76+S7zBPLyBbEWAuV23B2pVJjvkkXCHGxqd6Gp9Jy1tR47zCvKJ87SqlmR BxoIyL5UQwwmxcdcL8ZxeSvyUmrATNEGPjqc0xjAOYTgeKiXZOH58oatF64iI/POwZuJ arb8CNKT75M+fSum7c5F3rUFDiT6HQYEEdVolHMAfRtIuV5hOpLUwqArOwtAPoTOZ2tL NpIg== X-Gm-Message-State: APjAAAWEYOtCWdJ61W6U1lgJuMlUkJn/LeVyjF/uYoEPUTxRgQr7skJH NkRF4QyykPy5+BHXfopV2s442Hk1Khk= X-Google-Smtp-Source: APXvYqyIZD0oSRwFHUaEGuqI7Scj0dcrp1fJmJt67X/39my3vkgesALosIQgoum+BZ9h+vqdI4IDkA== X-Received: by 2002:a17:90a:cb87:: with SMTP id a7mr98644528pju.130.1564107941933; Thu, 25 Jul 2019 19:25:41 -0700 (PDT) Received: from oslab.tsinghua.edu.cn ([2402:f000:4:72:808::3ca]) by smtp.gmail.com with ESMTPSA id b190sm41508375pga.37.2019.07.25.19.25.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jul 2019 19:25:41 -0700 (PDT) From: Jia-Ju Bai To: davem@davemloft.net, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jia-Ju Bai Subject: [PATCH 1/2] net: ipv4: Fix a possible null-pointer dereference in inet_csk_rebuild_route() Date: Fri, 26 Jul 2019 10:25:34 +0800 Message-Id: <20190726022534.24994-1-baijiaju1990@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In inet_csk_rebuild_route(), rt is assigned to NULL on line 1071. On line 1076, rt is used: return &rt->dst; Thus, a possible null-pointer dereference may occur. To fix this bug, rt is checked before being used. This bug is found by a static analysis tool STCheck written by us. Signed-off-by: Jia-Ju Bai --- net/ipv4/inet_connection_sock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index f5c163d4771b..27d9d80f3401 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -1073,7 +1073,10 @@ static struct dst_entry *inet_csk_rebuild_route(struct sock *sk, struct flowi *f sk_setup_caps(sk, &rt->dst); rcu_read_unlock(); - return &rt->dst; + if (rt) + return &rt->dst; + else + return NULL; } struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu) From patchwork Fri Jul 26 02:25:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 1137190 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="K78OYLh7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45vtGN0scZz9sBZ for ; Fri, 26 Jul 2019 12:25:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726190AbfGZCZM (ORCPT ); Thu, 25 Jul 2019 22:25:12 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:42055 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725808AbfGZCZL (ORCPT ); Thu, 25 Jul 2019 22:25:11 -0400 Received: by mail-pg1-f194.google.com with SMTP id t132so23965171pgb.9; Thu, 25 Jul 2019 19:25:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=cepRcJFNdm0krVpqW6DO9gzxmkMHHb5KLKaLQ5UTyH8=; b=K78OYLh7hUM7NYoZlo/ezQ8HwVYNuZ61/Z8S429pPWg2irUhbSOVqUUuYzp0iDX/Jd SncaE1JfEm6w2nKX30MTCp2iB1qlc6jyMuC0mIdjxhyX9m6/bDQuw8yvcaxZ00FcsxWk TFFsS2LQu9a0+UjbnUZl158jxLGPfyCZ3qP6qCANivPuDH78rKV8ktA005lROQE7CivA LOrzulfln+8JlKG7CNh8GORqQm+HdccEOqfPjzCDIleG9VVUH9iNyTJp0oHRBXy9pAla 2rcmQkH1UVrSmTFXIFFpTjeKXFjn0OjS12hS+LvhH8Fq1Np5FeiOpxKx/4yT2p5sX2UK sxUg== 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=cepRcJFNdm0krVpqW6DO9gzxmkMHHb5KLKaLQ5UTyH8=; b=monhcPQKIzzLrsTTZj0udcDTmNK6qxs8Yc47De8LUS78h4T6/jSwFYx0W6qN5Amt7T 7pT+qsmboL7NhFk2WAUZwQdMG+7DEegaffbmdV6n1sO0/qoRZ4ocBs2/p97O5DLH0UTW /rg7EzJ0QhPl0b7IV6D753LqI5m0LD3X1W2IOl4eETY0TUAVKecl3NQAH+gk5Xmu2nb3 uaiH/IdwbF8IBn3zDdylC8etWYnZSV2e4jhKbehgcytkKFzfnhDggQZ/Tsa1ntllC9Gq E+i46z/ckTd3ziZrYGbC8eJ6uzs7UwytDzClQyIXC1DHfgaEhhZ0mpko5N55B6b0iSA7 0EwQ== X-Gm-Message-State: APjAAAUiHlZZc6HYsW+JRbToTytAya2wAQaAV8fLKJyIDC3WVlA0TU2+ cICwsfJwWLyuy67JqKNavR4= X-Google-Smtp-Source: APXvYqwddfnRUFydPWyno5YZy5rQ1pjR4IqwuenUrgipK7tkpaYpG4nj7WWBYt+b+SecaStfn6MvUw== X-Received: by 2002:a62:fb15:: with SMTP id x21mr11759590pfm.233.1564107911329; Thu, 25 Jul 2019 19:25:11 -0700 (PDT) Received: from oslab.tsinghua.edu.cn ([2402:f000:4:72:808::3ca]) by smtp.gmail.com with ESMTPSA id w18sm64658103pfj.37.2019.07.25.19.25.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jul 2019 19:25:10 -0700 (PDT) From: Jia-Ju Bai To: davem@davemloft.net, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jia-Ju Bai Subject: [PATCH 2/2] net: ipv4: Fix a possible null-pointer dereference in fib4_rule_suppress() Date: Fri, 26 Jul 2019 10:25:04 +0800 Message-Id: <20190726022505.24938-1-baijiaju1990@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In fib4_rule_suppress(), there is an if statement on line 145 to check whether result->fi is NULL: if (result->fi) When result->fi is NULL, it is used on line 167: fib_info_put(result->fi); In fib_info_put(), the argument fi is used: if (refcount_dec_and_test(&fi->fib_clntref)) Thus, a possible null-pointer dereference may occur. To fix this bug, result->fi is checked before calling fib_info_put(). This bug is found by a static analysis tool STCheck written by us. Signed-off-by: Jia-Ju Bai --- net/ipv4/fib_rules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index b43a7ba5c6a4..daedce293aab 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -163,7 +163,7 @@ static bool fib4_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg return false; suppress_route: - if (!(arg->flags & FIB_LOOKUP_NOREF)) + if (!(arg->flags & FIB_LOOKUP_NOREF) && result->fi) fib_info_put(result->fi); return true; }