From patchwork Thu Oct 9 16:05:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 398076 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7A6E41400D2 for ; Fri, 10 Oct 2014 03:05:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757464AbaJIQFv (ORCPT ); Thu, 9 Oct 2014 12:05:51 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:58727 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751372AbaJIQFt (ORCPT ); Thu, 9 Oct 2014 12:05:49 -0400 Received: by mail-pd0-f178.google.com with SMTP id y10so30936pdj.23 for ; Thu, 09 Oct 2014 09:05:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9g6ZlXLQtd3aJtpzkdRw8YIN8oyZxG1Y+T4mJ9GVF0g=; b=XmWZ50nR45DVWKLAHbSxRHU6UJGNezHfIOqufrnj8hmMuXJ5qMGdN/WYd3mzpuoRo0 otu5vkRdLbFmYWJeNiWafHtzWKNdcc6TaP+VtD+lXrmW4vkkhee/O/VfUJCHVi/AVAv+ 1oq4WuKpYBklAACC2It5PR0oWHDZFdhyjV22xAdZGRdUHb/+xWBJGPGgbAwtaBJVfSwF CjxXHOFQNLAqAZg7d5lukahl3Uno4iu6+lLySUdAxktWQ30LqK7Z11KppuZ/b2V8Huu6 SVgcLc3ByeVOTfGyzVyuovxnbFF0yFJTVFT9yny7pD6/sLlAFFt6tdHpSiPbzyW1YBEa tNRQ== X-Gm-Message-State: ALoCoQlJrjHD2wmk88G6dmq5i3vapwXMWPmqscUoPpZTszAbdcJtlsnN1fIDsjHcrxbCL5lIvJem X-Received: by 10.68.139.99 with SMTP id qx3mr633634pbb.103.1412870749144; Thu, 09 Oct 2014 09:05:49 -0700 (PDT) Received: from mew.home.network (c-24-19-133-29.hsd1.wa.comcast.net. [24.19.133.29]) by mx.google.com with ESMTPSA id tc5sm932852pbc.51.2014.10.09.09.05.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Oct 2014 09:05:48 -0700 (PDT) From: Omar Sandoval To: Jamal Hadi Salim , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Omar Sandoval Subject: [PATCH] net sched: text ematch: zero out ts_state before using it Date: Thu, 9 Oct 2014 09:05:21 -0700 Message-Id: <1412870721-31061-1-git-send-email-osandov@osandov.com> X-Mailer: git-send-email 2.1.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org textsearch_find zeroes out the offset, but the control buffer (which may or may not matter in this case) needs to be zeroed out as well. Signed-off-by: Omar Sandoval --- net/sched/em_text.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sched/em_text.c b/net/sched/em_text.c index 15d353d..2a1b6d9 100644 --- a/net/sched/em_text.c +++ b/net/sched/em_text.c @@ -36,6 +36,8 @@ static int em_text_match(struct sk_buff *skb, struct tcf_ematch *m, int from, to; struct ts_state state; + memset(&state, 0, sizeof(state)); + from = tcf_get_base_ptr(skb, tm->from_layer) - skb->data; from += tm->from_offset;