Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4640938ybl; Wed, 22 Jan 2020 01:51:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxTGjmaWisF+AjhXQSAm151ScnZF2fNdCgIVndwt6zc2/9JIOdIzEWgtmg7cj0DsOgp+n2v X-Received: by 2002:a05:6830:4d5:: with SMTP id s21mr6655406otd.294.1579686688854; Wed, 22 Jan 2020 01:51:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579686688; cv=none; d=google.com; s=arc-20160816; b=QwSLlmxzh1dEI38CiP+tumPm0TKTdColbg8v58nrQjIrVxbW40/95Sfr9RTI0acjcD QY7NB0MvaCrI81bkSTQmvnZgaM3+aj0n2EDMswRD7t1FUFHM4GKxgsAU/7/Nk+MDrA5j c8Mpyq/GL9nfznholVBkUEq//rgJT1BY6tVmUiU7gizDLpebPN86NIbpwGcc2UYzREzU oYRVedU2u/rADLFQpHXorj6GVXnWjYcnqY+7DdxkDiaacs6fcYmOVMhmDk67i7OD8rKY E627TQI0rl0R9M9iKnbfybzlHOUv5e0yy9A/ec4aR6p/fFLCU/A/r3JusrzDlihnjVkB /hHA== 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=p/tzffR/5CyZ6AMA/JRqvtumz700PAIAZJioCq0Jrv0=; b=XUCkPz8TSWZAcU5XlVX5deXlsHiMeA0T38xf3c33T/w6ahD3dQasZ5Le6Znaq6cycU bFYdPXkrOM7rEU3jS03sFXjNBI/5v/p1ONs+ORuNjYabuJl/lzHlz5p8Vocmfd/nQIm6 OREgkASeuMxlFFEbgq2YO911Xe4ikXxviys1sPxkHbAxtDgs+CXviaV5Cy9KQovlnweR 72iLDbnBya1SmFqFBR/+rrWh90r7OomTAzt8K4tlH/8S+JOqwcrPydJYNWoPVaoVGZY6 uVnSpMfTPPIJBzKR8/BUKgrytO7jRMdXQ5OKyi5TrrTCLAXS5SUrehZ5b0X3q6dM+lmc rL1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=K0pvfT1r; 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 y24si20616184oih.24.2020.01.22.01.51.17; Wed, 22 Jan 2020 01:51:28 -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=K0pvfT1r; 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 S1732639AbgAVJis (ORCPT + 99 others); Wed, 22 Jan 2020 04:38:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:55620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731921AbgAVJij (ORCPT ); Wed, 22 Jan 2020 04:38:39 -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 94AF424680; Wed, 22 Jan 2020 09:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685919; bh=DtwRVVqTyZbpxbz99B6ySyjw+czejKuHgMCK2ACEiqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K0pvfT1rJDBBGbUKrG5+mk4ohwNvJBjx6FKP6ZPFx5UFUVHM1JWasHCIDtHrndJe2 CpS3W50B2yaHpGVtxpioEv0cPhQSm6cTcEY7+h+NoczMOBp9Wn9K3dReqmpQdDL3KI 3NDvnewSbvMoxCjCQ2zs0qLjSWgK3HOU1iwFsyoU= 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.14 36/65] cfg80211: fix page refcount issue in A-MSDU decap Date: Wed, 22 Jan 2020 10:29:21 +0100 Message-Id: <20200122092756.021562257@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092750.976732974@linuxfoundation.org> References: <20200122092750.976732974@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 @@ -652,7 +652,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); }