Received: by 10.192.165.148 with SMTP id m20csp4517808imm; Mon, 30 Apr 2018 21:26:50 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrcchIRD+R8/af9cZHswA0hvaDk5GcWOUYiQTXia87vOLUFCExtRTh/c00c9wdOd8qek8qd X-Received: by 2002:a65:5142:: with SMTP id g2-v6mr1339002pgq.349.1525148810031; Mon, 30 Apr 2018 21:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525148809; cv=none; d=google.com; s=arc-20160816; b=a72WIqZAhO1Zm5AuVH40sp2JxcAPTSqJAH2PJ3K8D3wjVdQ2owxdGtNnX+iJIRUnCP KQCVljt9gBS6uZ/bxPIRWmu804NzB/ADBEZUqOq9eVMmtQFXrFw3/RN5cRYcegtkYczQ uvsYHUXxDtf0GKaUi+VpkiwdlmeS73PnzCKyUK8z4+AzY7scCUJSAAt38ArMjRUxgdGh kAs/LeeTZ8a5Hhipfp19OFAbDqdy6Vha4eBqwQluRZQxqrKCi9BckU0lCnjnGr7687CF yxlEmVAen/a0fpHz9J+p4S5eI/R9mkijHgIKJScVeVPD1Jl7sSG18BTyHvAELIzpzjhY r81Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=ikaQWqtr2p/3a/nFs7YAiRTnPsme8s5/ofWDe0zqAEc=; b=K6TCvE4lm7Q6y/ojmX4RIkmCaCiL45AgDc6c/RcZ60cyPGj880tBhc+ZRMebPw/wYy xxWyYS5kG8g0FRQ3H15Hk6aaPRQAhkPHtn0S13fVrZN4Wjr15NirPfjKQbf8K6Vn/4lN FwfcMswOjdxVD9bpuIOyTKwvQzrzg+F4l56l3YHpVJURS6HjcuPc2BjJS5SuLu8TdC3A ayuIkfypwVcWXo4JM9+iLSvpO6DEXWoh7SQ+UlX0bIN9NF/LPiFP2am7iE783zIaQZlD cM0KZRbGkLZxhtqfFTvSgpJgeuWQYzDjTP4u0hBKrK6rkr1PQ+345TWrLgugbG7KjPF9 gh2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=HTUS74d8; 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=umn.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h1-v6si8700901pld.539.2018.04.30.21.26.34; Mon, 30 Apr 2018 21:26:49 -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=@umn.edu header.s=google header.b=HTUS74d8; 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=umn.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751240AbeEAE0W (ORCPT + 99 others); Tue, 1 May 2018 00:26:22 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:40372 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750823AbeEAE0U (ORCPT ); Tue, 1 May 2018 00:26:20 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 937615A4 for ; Tue, 1 May 2018 04:26:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kCwGviLaXcCN for ; Mon, 30 Apr 2018 23:26:19 -0500 (CDT) Received: from mail-io0-f198.google.com (mail-io0-f198.google.com [209.85.223.198]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 6B4C8979 for ; Mon, 30 Apr 2018 23:26:19 -0500 (CDT) Received: by mail-io0-f198.google.com with SMTP id r140-v6so10136113iod.16 for ; Mon, 30 Apr 2018 21:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=ikaQWqtr2p/3a/nFs7YAiRTnPsme8s5/ofWDe0zqAEc=; b=HTUS74d82S4uvVwBOXRKerp7BINU7PkzEvC9RYChKTpApPTgLU+hcng1JktSBX2AJb 4W1PeFwN1WltDaz10sPS3qQOLhEkUs/+t7hdQPW+Z6WwhkEw7b0SBNXnRG+8N81si0h5 /Rvq/ssGlwa00dhL8kxeXGfoBPSBBb0mjv9R9trgU+WjO3dYh7SMAMCFqKV8y/WziI+m QKKCZCjMZr+M1Pti3+hvw/akwYYNH+TSYCQ5tyaax7iTwjOPSg+0FfJHZa9zPhWmwf9o Be/bvOsN7qEzBjGt78qWh3LUlu0iWzZYrZjcOogNb45r58Lk1aAkNlMPAgx3DBbaXK4B lIBA== 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=ikaQWqtr2p/3a/nFs7YAiRTnPsme8s5/ofWDe0zqAEc=; b=ByddTY0YVYqtlwUCCGCoQv3hxQPqvlcPC3JZhPf4Yu8IHJI6q1GF0/lRo5U4MnR6A+ AY3gH8MZPI5lh12vPxqdlsS1JyEEuBr0XhMVAzccCzkpfNYUn97HfjjFntdTgGDHxKfB sO/ON0hhsPHITIkgV45E45KLr7TvItPOlsKo61CV6uDlm7uA+1sAlZAxOCOvyQEm9xAw pPuhcDHK3pvmK2tTer5Rb4RHVllEvGtRq/XuGTaEPScNaDcxWhTtAF4qJTNx8D3NHwfv 4IB8YzyUJ7fWqaT/hNdv7aMXIs/VUZj8JJOYFBl1Vs/8QQ+GXP/U8118M0sE5Hdb+ex5 yZpA== X-Gm-Message-State: ALQs6tDRQKRQCfq8OEmztZ9yyWDU7rCeEjIYtzBglUKypo4FGsEFld5H 3faJ3WyfV2qfngAzGB/GsIuoemkXBf9c8BME89B4TvUGXr+8YGTJQh6IeoH4euQ87tha7Y4UNbx CSVUbYGyUb3KjJI0YzyDyrZi4MPLb X-Received: by 2002:a6b:2903:: with SMTP id p3-v6mr15636682iop.303.1525148779000; Mon, 30 Apr 2018 21:26:19 -0700 (PDT) X-Received: by 2002:a6b:2903:: with SMTP id p3-v6mr15636676iop.303.1525148778836; Mon, 30 Apr 2018 21:26:18 -0700 (PDT) Received: from cs-u-cslp16.cs.umn.edu (cs-u-cslp16.cs.umn.edu. [134.84.121.95]) by smtp.gmail.com with ESMTPSA id l203-v6sm4352570ioa.74.2018.04.30.21.26.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Apr 2018 21:26:18 -0700 (PDT) From: Wenwen Wang To: Wenwen Wang Cc: Kangjie Lu , Jon Maloy , Ying Xue , "David S. Miller" , netdev@vger.kernel.org (open list:TIPC NETWORK LAYER), tipc-discussion@lists.sourceforge.net (open list:TIPC NETWORK LAYER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] tipc: fix a potential missing-check bug Date: Mon, 30 Apr 2018 23:26:01 -0500 Message-Id: <1525148761-11091-1-git-send-email-wang6495@umn.edu> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In tipc_link_xmit(), the member field "len" of l->backlog[imp] must be less than the member field "limit" of l->backlog[imp] when imp is equal to TIPC_SYSTEM_IMPORTANCE. Otherwise, an error code, i.e., -ENOBUFS, is returned. This is enforced by the security check. However, at the end of tipc_link_xmit(), the length of "list" is added to l->backlog[imp].len without any further check. This can potentially cause unexpected values for l->backlog[imp].len. If imp is equal to TIPC_SYSTEM_IMPORTANCE and the original value of l->backlog[imp].len is less than l->backlog[imp].limit, after this addition, l->backlog[imp] could be larger than l->backlog[imp].limit. That means the security check can potentially be bypassed, especially when an adversary can control the length of "list". This patch performs such a check after the modification to l->backlog[imp].len (if imp is TIPC_SYSTEM_IMPORTANCE) to avoid such security issues. An error code will be returned if an unexpected value of l->backlog[imp].len is generated. Signed-off-by: Wenwen Wang --- net/tipc/link.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/tipc/link.c b/net/tipc/link.c index 695acb7..62972fa 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -948,6 +948,11 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list, continue; } l->backlog[imp].len += skb_queue_len(list); + if (imp == TIPC_SYSTEM_IMPORTANCE && + l->backlog[imp].len >= l->backlog[imp].limit) { + pr_warn("%s<%s>, link overflow", link_rst_msg, l->name); + return -ENOBUFS; + } skb_queue_splice_tail_init(list, backlogq); } l->snd_nxt = seqno; -- 2.7.4