From patchwork Wed Feb 14 17:22:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 873438 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="Nvb/Xg3Y"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zhR7W62rMz9t3M for ; Thu, 15 Feb 2018 04:23:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161104AbeBNRXB (ORCPT ); Wed, 14 Feb 2018 12:23:01 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:40255 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1033384AbeBNRW7 (ORCPT ); Wed, 14 Feb 2018 12:22:59 -0500 Received: by mail-pf0-f193.google.com with SMTP id u20so2937460pfl.7 for ; Wed, 14 Feb 2018 09:22:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=u89edjx0kARtCOYO4DGZ7xq2D7/6D4jyBBctr9Mwmng=; b=Nvb/Xg3Yf6DIFDPDqQxZNIHgCqivEFebqnvFHKlgtjjoUzHgLpPAeWuR7taQxBOEia zzUbjfB2oIV0PznPC1byGpJcqZ9rjDDJ1uxdaU5g4f33w3iBYLLTiRbDoWbgV0NTPefE 1mSTSwe8oQqd0YYJ3pQEGLLbYjrGGboXSSMW4hwGEjJ7zcm7ffJvZSJq/2cJOI//J3e/ 0A+MSm0+alyaWmsHMqQ8OQbllRQvMuYUnN6muofGs0XnvTqP+4CDDpuJcrTgdoUqnoSj +toJUfMJzXaFPMoeX73xqVmKeITbon72KSKw+3cq0bkR8DKdKvICaRft/tCG70ayDXTT 2XSw== 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=u89edjx0kARtCOYO4DGZ7xq2D7/6D4jyBBctr9Mwmng=; b=F//BXN6se7gAaXhfeATA1dTUxv+6t81C6aqXwi/XB/tzTJuDjwC4N6qLXAj0m9rz1u Fj47VAXgGwvGOMhSVIwocaW5M1e0hhf1ZqWryj+rDaxwxN1QJWycKSA0B/8vgOw3mOv1 TvHx8Id2t4D4fD8+5/hCRsShws8uZ03u3orQR7o+qq/gRZaHY+couVhZxNs3GxbBIAN8 EPlY/IR6utyBDAG0XuPUnMJYBeSfucJ1a2uGM+wmNoUJAYDkEQ9vU+HdVWciGDyzfZSr q72zItcvhRDmNNcQzzjZU8zg+RQjDJ4MDpOHJjmpArYvlqTcHcbiKX/OdoOv/hOp0vsq qjpw== X-Gm-Message-State: APf1xPCuR4rGwiUuIL4goFMMvT6vDvkCQBkzUVttBAK0AdDxSnv+BuTd 6DvFhLJjyNxbALObV7H35I7JCA== X-Google-Smtp-Source: AH8x225e5+kAC4/1ApC+UEfpNBBKcFo/OSneL+UtwSrk/eeZ3DJ/d7uV0TXiQoitfNJj8qaI4maFfA== X-Received: by 10.98.129.5 with SMTP id t5mr5447212pfd.6.1518628978986; Wed, 14 Feb 2018 09:22:58 -0800 (PST) Received: from localhost.localdomain (67-207-98-108.static.wiline.com. [67.207.98.108]) by smtp.gmail.com with ESMTPSA id b88sm29235182pfd.108.2018.02.14.09.22.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 09:22:57 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, Tom Herbert Subject: [PATCH net-next] kcm: Call strp_stop before strp_done in kcm_attach Date: Wed, 14 Feb 2018 09:22:42 -0800 Message-Id: <20180214172242.3896-1-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In kcm_attach strp_done is called when sk_user_data is already set to fail the attach. strp_done needs the strp to be stopped and warns if it isn't. Call strp_stop in this case to eliminate the warning message. Reported-by: syzbot+88dfb55e4c8b770d86e3@syzkaller.appspotmail.com Fixes: e5571240236c5652f ("kcm: Check if sk_user_data already set in kcm_attach" Signed-off-by: Tom Herbert --- net/kcm/kcmsock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index f297d53a11aa..435594648dac 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1417,6 +1417,7 @@ static int kcm_attach(struct socket *sock, struct socket *csock, */ if (csk->sk_user_data) { write_unlock_bh(&csk->sk_callback_lock); + strp_stop(&psock->strp); strp_done(&psock->strp); kmem_cache_free(kcm_psockp, psock); return -EALREADY;