From patchwork Mon Apr 18 11:37:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 611705 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 3qpRBl5NH1z9t3f for ; Mon, 18 Apr 2016 21:44:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru header.b=xdSllLty; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753007AbcDRLoa (ORCPT ); Mon, 18 Apr 2016 07:44:30 -0400 Received: from forward-corp1f.mail.yandex.net ([95.108.130.40]:59912 "EHLO forward-corp1f.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbcDRLo3 (ORCPT ); Mon, 18 Apr 2016 07:44:29 -0400 X-Greylist: delayed 429 seconds by postgrey-1.27 at vger.kernel.org; Mon, 18 Apr 2016 07:44:28 EDT Received: from smtpcorp1m.mail.yandex.net (smtpcorp1m.mail.yandex.net [77.88.61.150]) by forward-corp1f.mail.yandex.net (Yandex) with ESMTP id 5AB14242023E; Mon, 18 Apr 2016 14:37:14 +0300 (MSK) Received: from smtpcorp1m.mail.yandex.net (localhost [127.0.0.1]) by smtpcorp1m.mail.yandex.net (Yandex) with ESMTP id 1F9DF2CA0771; Mon, 18 Apr 2016 14:37:14 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:408:eef4:bbff:fe5b:9a77]) by smtpcorp1m.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id XTtGCzfaqL-bEWm302g; Mon, 18 Apr 2016 14:37:14 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1460979434; bh=O0xGrXyjGyMxs0V1ChO0Bv55K/JuH2UpGJHcYrd7oZY=; h=Subject:From:To:Cc:Date:Message-ID:User-Agent:MIME-Version: Content-Type:Content-Transfer-Encoding; b=xdSllLtyy0gSXZq+B9+zpBPPDubg0RY2jTPA732ebcQGuMO7NYFkRc/lUftvH3riR lIz38KbVajtNCXNzlTF1dryVGXBke/KKHOJ2AuKsww5225bT93mcB2cfuHezLEvxV3 Gjevu0Nmmc90Emp7HnOSquzmGE+klItkwwXU2Dlg= Authentication-Results: smtpcorp1m.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] cls_cgroup: get sk_classid only from full sockets From: Konstantin Khlebnikov To: netdev@vger.kernel.org, "David S. Miller" Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 18 Apr 2016 14:37:10 +0300 Message-ID: <146097943086.15300.8997345346172526153.stgit@buzz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb->sk could point to timewait or request socket which has no sk_classid. Detected as "BUG: KASAN: slab-out-of-bounds in cls_cgroup_classify". Signed-off-by: Konstantin Khlebnikov Acked-by: Eric Dumazet --- include/net/cls_cgroup.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index c0a92e2c286d..74c9693d4941 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h @@ -17,6 +17,7 @@ #include #include #include +#include #ifdef CONFIG_CGROUP_NET_CLASSID struct cgroup_cls_state { @@ -63,11 +64,13 @@ static inline u32 task_get_classid(const struct sk_buff *skb) * softirqs always disables bh. */ if (in_serving_softirq()) { + struct sock *sk = skb_to_full_sk(skb); + /* If there is an sock_cgroup_classid we'll use that. */ - if (!skb->sk) + if (!sk || !sk_fullsock(sk)) return 0; - classid = sock_cgroup_classid(&skb->sk->sk_cgrp_data); + classid = sock_cgroup_classid(&sk->sk_cgrp_data); } return classid;