From patchwork Fri Jan 15 21:55:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sebastian =?ISO-8859-1?Q?P=F6hn?= X-Patchwork-Id: 568493 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 6F5E4140BAB for ; Sat, 16 Jan 2016 08:55:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=GDEpSdsQ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756380AbcAOVzW (ORCPT ); Fri, 15 Jan 2016 16:55:22 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:36898 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755814AbcAOVzV (ORCPT ); Fri, 15 Jan 2016 16:55:21 -0500 Received: by mail-wm0-f52.google.com with SMTP id f206so44489870wmf.0 for ; Fri, 15 Jan 2016 13:55:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:date:content-type:mime-version :content-transfer-encoding; bh=4aqOVlQtmVe1/2nI8ng0qxvPDmYBBHTG7743vie290M=; b=GDEpSdsQYePZ3JZKGfGySyRYjeG/EBvK/RmhCz/q31SnKwxb1kF9VCi/dFBfkm2FjE t4HmQrAaiJSztpcPf08Wz8g16widiXWAS7qd04bfEDbH5dMPnLVgGjzyt1fvmX1lT488 /pHXVaM5oGkvCvCD3U2bbYKl7GSb+jtX5VtJ6g5z8wVbauSE/aSZh9HImLYXB1C1tgDL FWGbBoA1SnNyTG9JPhP+MaALY2QegsQfSwIzTJvc1rR2ZHKmM+KJmqE0EwBBmbQV/ES9 SBxgbRxuEBbd2DbF2MfApRyMfq7gvGIH6OvO6j2IwibYn/4NObN5LndfVWvgKKM6qMgt +Fsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:date:content-type :mime-version:content-transfer-encoding; bh=4aqOVlQtmVe1/2nI8ng0qxvPDmYBBHTG7743vie290M=; b=hKXrZctgqWITo80hb4Wq5LmsWbXJAF442/j/KRsBIDNBwDrXLZyAHqnfZmwhrLdYB2 hHA/qEbJk16feeK4Ui6QON/Ec7uKHtDhooXTdqhkRxL1yYSg+/t+KPZ2R2vqNBg++WJ6 JND6oGrfZ94BpgsELlsJYlWH8RxWHMhYsXp3WaRoV5EMfl/3rQM77BRezKpJL5QFeBHz /2WXdLcLVY3vkjX/Kb+rs338F393MkoPG/SypRC1nZk8iwvcNj45kGrv5RiMLAEZxwwf 1mmKwd91QCv8IITIWlvude+3SycJWRuPxwrvtRrI7/TmOqSeCcI3Jw2PxfW+1wNBX4mT w+zA== X-Gm-Message-State: ALoCoQko8iR47ra1SPIXQed+q1699SiKaR+U9kMSfObVeW+49aOM29wH55IXft9wnEGLPHYTLe2xQ66v41xy6xAN1VU3u9NWYQ== X-Received: by 10.194.9.98 with SMTP id y2mr12208754wja.105.1452894920400; Fri, 15 Jan 2016 13:55:20 -0800 (PST) Received: from alpha.fritz.box (dslb-094-217-060-214.094.217.pools.vodafone-ip.de. [94.217.60.214]) by smtp.gmail.com with ESMTPSA id lx4sm12362412wjb.5.2016.01.15.13.55.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 13:55:19 -0800 (PST) Message-ID: <1452894918.4622.3.camel@gmail.com> Subject: nf_conntrack_h323: Fix locking in process_urq From: Sebastian =?ISO-8859-1?Q?P=F6hn?= To: netdev@vger.kernel.org Date: Fri, 15 Jan 2016 22:55:18 +0100 X-Mailer: Evolution 3.18.3 (3.18.3-1.fc23) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org nf_ct_remove_expectations has to be called under nf_conntrack_expect_lock      Signed-off-by: Sebastian Pöhn diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index 9511af0..d477375 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -1518,7 +1518,9 @@ static int process_urq(struct sk_buff *skb, struct nf_conn *ct,         }           /* Clear old expect */ +       spin_lock_bh(&nf_conntrack_expect_lock);         nf_ct_remove_expectations(ct); +       spin_unlock_bh(&nf_conntrack_expect_lock);         info->sig_port[dir] = 0;         info->sig_port[!dir] = 0;