Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4641993ybl; Wed, 22 Jan 2020 01:53:09 -0800 (PST) X-Google-Smtp-Source: APXvYqxSuULMoG2q5y4m+9p1/rFcGBcJK4DLUriDdQNuvRgR7Q5cNpjf0c0f7Z+0WOEUXbLpyCSF X-Received: by 2002:aca:6042:: with SMTP id u63mr6326958oib.76.1579686788812; Wed, 22 Jan 2020 01:53:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579686788; cv=none; d=google.com; s=arc-20160816; b=O5VD3nEvutTsgMX2ZUClUPqbG6wOgaIn4TfYO0NOQhU5xjfbLReUjjyD+4t3S1+L4R rzn6zghqw3asWWwCqfW+FEs2Y0z9JBba9xeZUgkOhNjg4/48FoGRxu7YOWI8KyyP6g9h MtKS/P0Tqykm8JPPrWzL9kPyxIAVPD9TugQNuyR85sa0PCKBD38iBeIoTgfyXpxeJ5PF XrE3QnD9/1n1nzP1NYt2x9wz03VTrnmKzzwjgkR6D8Kv5n5uxecgGUpiMYY5qjp1ojI0 cNLe41YFUeSJcKTt2bwJjcGaWc1oNiWAJ9EcBpQZreO4WuRXq7r4bjEsYDRZBGgbnW/r jaeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oVEAKgNBL0ZickK+5ymg02YW5fD7uUqK2TGPkAET13U=; b=USlO4QnV611weHKLVbMWLcZUy2kaYxkiqKEJC8la2sH8s0RyWP4URgvGUYO+mRZ/Ey nRVYgtEYEs9krd5k/7Tdy5ODN/y8pS2rahLStjzn929tlXB4F+LC5+HPi64i439/57y4 VYANQHl56UgmaPxgmzOGQuEQ/t/sxCrxuFMrS1yKgW5MLWzIITsJ/bAo9aCXToQPl2sq zQJVcg+FGRHweiBxSs9wkBCYPwdxxE2cki3HnnFewJVevoZV87zT+KYR2ovhGcxy//g/ 2swjCqXOcdBhkbRS5KbZuHL/cIZWworvYAQEHkiXRV1bBhMU1mdWq+VM2Mq6Qxe61o6/ HZnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q1LVNFqE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y6si21388733oih.217.2020.01.22.01.52.57; Wed, 22 Jan 2020 01:53:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q1LVNFqE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731893AbgAVJga (ORCPT + 99 others); Wed, 22 Jan 2020 04:36:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:51842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731737AbgAVJgW (ORCPT ); Wed, 22 Jan 2020 04:36:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C40F020704; Wed, 22 Jan 2020 09:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685782; bh=xEqQe+iFvcpuTaewfAEDo85AX9dkiNHS+PTLtfioDOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q1LVNFqEh+Ozljs7IbRySJHaN3JoTfAocuAt/S6mQnM3kSTvfw9mDWn7dy5USFzYQ 7TCBY5M97zMbMRkclE3rxRYdiXwYjbFZdSu3uBOL7VfFHg4z2+3M/uq3Nvbmj9W8hk 48ao1CoBlib8pdMUDuGunr6rPnKWfEUfrXpfJsnk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Johannes Berg Subject: [PATCH 4.9 77/97] cfg80211: fix page refcount issue in A-MSDU decap Date: Wed, 22 Jan 2020 10:29:21 +0100 Message-Id: <20200122092808.715746329@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092755.678349497@linuxfoundation.org> References: <20200122092755.678349497@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Felix Fietkau commit 81c044fc3bdc5b7be967cd3682528ea94b58c06a upstream. The fragments attached to a skb can be part of a compound page. In that case, page_ref_inc will increment the refcount for the wrong page. Fix this by using get_page instead, which calls page_ref_inc on the compound head and also checks for overflow. Fixes: 2b67f944f88c ("cfg80211: reuse existing page fragments in A-MSDU rx") Cc: stable@vger.kernel.org Signed-off-by: Felix Fietkau Link: https://lore.kernel.org/r/20200113182107.20461-1-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/wireless/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -653,7 +653,7 @@ __frame_add_frag(struct sk_buff *skb, st struct skb_shared_info *sh = skb_shinfo(skb); int page_offset; - page_ref_inc(page); + get_page(page); page_offset = ptr - page_address(page); skb_add_rx_frag(skb, sh->nr_frags, page, page_offset, len, size); }