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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=unavailable 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 E44C8C10F00 for ; Wed, 27 Mar 2019 22:11:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A61E2206BA for ; Wed, 27 Mar 2019 22:11:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727810AbfC0WLy (ORCPT ); Wed, 27 Mar 2019 18:11:54 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:47101 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725972AbfC0WLx (ORCPT ); Wed, 27 Mar 2019 18:11:53 -0400 Received: from mail-wm1-f71.google.com ([209.85.128.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1h9Glz-0005Ug-HV for linux-kernel@vger.kernel.org; Wed, 27 Mar 2019 22:11:51 +0000 Received: by mail-wm1-f71.google.com with SMTP id t82so630448wmg.8 for ; Wed, 27 Mar 2019 15:11:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=WXjYdAUAnz6+/eYr5Y7Yrp7ylVTll3WJTmB9qgkkyAw=; b=P7mUiiUrSjQlMPMltOx4/jpy5L8f6ENspWRpPG8xg9qFD0ea7wkstJJedDzS0/9p1W 0adzq5jllBaXieeyE12HzQ6WyJ/U33qdr0VCypYeqwxieQHjgrUAxTWQKWPAL4M28xq3 OIxMQ65uM4HveNO8yAqiE92dXqcQXMznJQVqj7T+F/3XPxAqJjvT57YTmtM6Sn4XZwxi lCuHV7V91sgYQa+DfZhFqyvGiLYzp2CAeqCSYez4gg1RyZfKsv0nhGtISvJILr82qo4r fE9ml2BRfbzUMIC2qoopKHAiZxC9Pqq/L6kQ3O3FzG/Iu/Z0HnykIqU8/oHuPMq8k2Ju 8CFQ== X-Gm-Message-State: APjAAAW2t5J7gXPDXxWj/7HYPNTdi5HxfuvuWSBWEwU+PIxULJ0zKkuJ 6QrtKw3cQkNHTGtpfL14OngYs2sKzkyywoMKekv2n97QEgK/TGx/5uLtNNY5Gu2h2N3dv/YQa5/ sm7z7hONMIPI6z7++Rd0Rhisy6vCcxh6JrroMry4RQA== X-Received: by 2002:adf:e692:: with SMTP id r18mr26623163wrm.231.1553724711241; Wed, 27 Mar 2019 15:11:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLjebGTxkNWh5ddJr8xfJP3+1SU4iS1hyl/Xn/2kqvtWKIT2j4IFVTagZuYXFHiPFvAiOs/A== X-Received: by 2002:adf:e692:: with SMTP id r18mr26623150wrm.231.1553724710969; Wed, 27 Mar 2019 15:11:50 -0700 (PDT) Received: from localhost (host141-127-dynamic.17-87-r.retail.telecomitalia.it. [87.17.127.141]) by smtp.gmail.com with ESMTPSA id o17sm22708991wrw.73.2019.03.27.15.11.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Mar 2019 15:11:50 -0700 (PDT) Date: Wed, 27 Mar 2019 23:11:49 +0100 From: Andrea Righi To: Pravin B Shelar Cc: "David S. Miller" , netdev@vger.kernel.org, dev@openvswitch.org, linux-kernel@vger.kernel.org Subject: [PATCH] openvswitch: fix flow actions reallocation Message-ID: <20190327221148.GA16096@xps-13> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The flow action buffer can be resized if it's not big enough to contain all the requested flow actions. However, this resize doesn't take into account the new requested size, the buffer is only increased by a factor of 2x. This might be not enough to contain the new data, causing a buffer overflow, for example: [ 42.044472] ============================================================================= [ 42.045608] BUG kmalloc-96 (Not tainted): Redzone overwritten [ 42.046415] ----------------------------------------------------------------------------- [ 42.047715] Disabling lock debugging due to kernel taint [ 42.047716] INFO: 0x8bf2c4a5-0x720c0928. First byte 0x0 instead of 0xcc [ 42.048677] INFO: Slab 0xbc6d2040 objects=29 used=18 fp=0xdc07dec4 flags=0x2808101 [ 42.049743] INFO: Object 0xd53a3464 @offset=2528 fp=0xccdcdebb [ 42.050747] Redzone 76f1b237: cc cc cc cc cc cc cc cc ........ [ 42.051839] Object d53a3464: 6b 6b 6b 6b 6b 6b 6b 6b 0c 00 00 00 6c 00 00 00 kkkkkkkk....l... [ 42.053015] Object f49a30cc: 6c 00 0c 00 00 00 00 00 00 00 00 03 78 a3 15 f6 l...........x... [ 42.054203] Object acfe4220: 20 00 02 00 ff ff ff ff 00 00 00 00 00 00 00 00 ............... [ 42.055370] Object 21024e91: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ [ 42.056541] Object 070e04c3: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ [ 42.057797] Object 948a777a: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ [ 42.059061] Redzone 8bf2c4a5: 00 00 00 00 .... [ 42.060189] Padding a681b46e: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ Fix by making sure the new buffer is properly resized to contain all the requested data. BugLink: https://bugs.launchpad.net/bugs/1813244 Signed-off-by: Andrea Righi --- net/openvswitch/flow_netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index 691da853bef5..e6f789badaa3 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -2306,14 +2306,14 @@ static struct nlattr *reserve_sfa_size(struct sw_flow_actions **sfa, struct sw_flow_actions *acts; int new_acts_size; - int req_size = NLA_ALIGN(attr_len); + size_t req_size = NLA_ALIGN(attr_len); int next_offset = offsetof(struct sw_flow_actions, actions) + (*sfa)->actions_len; if (req_size <= (ksize(*sfa) - next_offset)) goto out; - new_acts_size = ksize(*sfa) * 2; + new_acts_size = max(req_size, ksize(*sfa) * 2); if (new_acts_size > MAX_ACTIONS_BUFSIZE) { if ((MAX_ACTIONS_BUFSIZE - next_offset) < req_size) { -- 2.19.1