From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx49XvzpwAfhYDUZ85U0xicbf07PIeljAdsXcUGnc1i/2WXHr/k+6kAP4RozoOENseMruUU2Z ARC-Seal: i=1; a=rsa-sha256; t=1523022115; cv=none; d=google.com; s=arc-20160816; b=LJLnCmhEp6eZZyG3aEuBMydlRdmxSbz8w+OQ8ql6Lkp5xheTb3kh74BhKEfpWAhdi5 ReVD/13N5npzEJsqYPsflnWWFBQ2Y67JQ0jVbiFj6VlwHfkk5PjWRbRbD4dNPNtAXzBH eU4WHS5S4TyM+OThUgC/c7KpoidhPRSv1mYLcUMOHZ0me7gvOpeYCGImrPDjjpIA04po /dMYq3+IGJYssIy+CoV9QMJ/SE/FowWZka5r5ipxIcok+aBtY2sn+x3aiPnUAXZJI+Pa 0OOaTLuuudoHrmN2Q64VaS1rjet09/mlQuR7Fvsk4//skX/TmvGePyrbpOymKs4UXhAW NtrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=gLMfE0SR9/ontPGtpRqTVtMv3X8RK04QJxo7cvqXzPQ=; b=vhp5DlhljlrE6A7DhnmDxdR8jPJzWPCNIss46TddTQRVpqQaJhmhOWRAu/gBmy8/Vz 7k7PeiKgYqftkdqb4KtlNRhmColJZCFbqa7LuqkMignTUxZLZJzERhQWtxH96Y7VTrxh +/7C3LDvX/f0w1a4jDOw/eCjEFqDDkZwfvj5T7UicXnl1zttGbUzhVm8Z0ZNMrZxI1OV PyUVNJ1ofws/jgxaj5cMkfMZ2wUdo974tzygxIN0YMzBkEqd61ZGxuA9BzANWyUu9NEw 3L9kS4IEMCMth8U7FIgUixKumwcBJxXAQBq22WfyMD8erBJT0LhOHyC6Ngu8Z1+Agq4D MqaA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+bdabab6f1983a03fc009@syzkaller.appspotmail.com, Florian Westphal , Eric Dumazet , Pablo Neira Ayuso Subject: [PATCH 4.15 33/72] netfilter: bridge: ebt_among: add more missing match size checks Date: Fri, 6 Apr 2018 15:24:08 +0200 Message-Id: <20180406084352.132774410@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084349.367583460@linuxfoundation.org> References: <20180406084349.367583460@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597003597962532229?= X-GMAIL-MSGID: =?utf-8?q?1597004437710429214?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal commit c8d70a700a5b486bfa8e5a7d33d805389f6e59f9 upstream. ebt_among is special, it has a dynamic match size and is exempt from the central size checks. commit c4585a2823edf ("bridge: ebt_among: add missing match size checks") added validation for pool size, but missed fact that the macros ebt_among_wh_src/dst can already return out-of-bound result because they do not check value of wh_src/dst_ofs (an offset) vs. the size of the match that userspace gave to us. v2: check that offset has correct alignment. Paolo Abeni points out that we should also check that src/dst wormhash arrays do not overlap, and src + length lines up with start of dst (or vice versa). v3: compact wormhash_sizes_valid() part NB: Fixes tag is intentionally wrong, this bug exists from day one when match was added for 2.6 kernel. Tag is there so stable maintainers will notice this one too. Tested with same rules from the earlier patch. Fixes: c4585a2823edf ("bridge: ebt_among: add missing match size checks") Reported-by: Signed-off-by: Florian Westphal Reviewed-by: Eric Dumazet Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/bridge/netfilter/ebt_among.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) --- a/net/bridge/netfilter/ebt_among.c +++ b/net/bridge/netfilter/ebt_among.c @@ -177,6 +177,28 @@ static bool poolsize_invalid(const struc return w && w->poolsize >= (INT_MAX / sizeof(struct ebt_mac_wormhash_tuple)); } +static bool wormhash_offset_invalid(int off, unsigned int len) +{ + if (off == 0) /* not present */ + return false; + + if (off < (int)sizeof(struct ebt_among_info) || + off % __alignof__(struct ebt_mac_wormhash)) + return true; + + off += sizeof(struct ebt_mac_wormhash); + + return off > len; +} + +static bool wormhash_sizes_valid(const struct ebt_mac_wormhash *wh, int a, int b) +{ + if (a == 0) + a = sizeof(struct ebt_among_info); + + return ebt_mac_wormhash_size(wh) + a == b; +} + static int ebt_among_mt_check(const struct xt_mtchk_param *par) { const struct ebt_among_info *info = par->matchinfo; @@ -189,6 +211,10 @@ static int ebt_among_mt_check(const stru if (expected_length > em->match_size) return -EINVAL; + if (wormhash_offset_invalid(info->wh_dst_ofs, em->match_size) || + wormhash_offset_invalid(info->wh_src_ofs, em->match_size)) + return -EINVAL; + wh_dst = ebt_among_wh_dst(info); if (poolsize_invalid(wh_dst)) return -EINVAL; @@ -201,6 +227,14 @@ static int ebt_among_mt_check(const stru if (poolsize_invalid(wh_src)) return -EINVAL; + if (info->wh_src_ofs < info->wh_dst_ofs) { + if (!wormhash_sizes_valid(wh_src, info->wh_src_ofs, info->wh_dst_ofs)) + return -EINVAL; + } else { + if (!wormhash_sizes_valid(wh_dst, info->wh_dst_ofs, info->wh_src_ofs)) + return -EINVAL; + } + expected_length += ebt_mac_wormhash_size(wh_src); if (em->match_size != EBT_ALIGN(expected_length)) {