From patchwork Tue Mar 17 10:54:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229364 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77A6CC10F29 for ; Tue, 17 Mar 2020 10:56:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A90820714 for ; Tue, 17 Mar 2020 10:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442586; bh=SanQ3vDyH9uTO+yYf1cJEVS1/6HAU0Rq1i5TyLKQZyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IB/6XB27Y+JSsXkXpXaJNSg+PqjMCiLgaWsoqcEQGa+08oluwnmbqaGpv4SZMOsiX OGVLOcYoGdumGxDRCAiVCS3JbaJOFITbizv3pHng+LdtIy5YeEEfmqLN54mlPAkKoa H0kKggPxfVY3HIvw7agNPojxvqrXyzy40FkeJKHc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726485AbgCQK4W (ORCPT ); Tue, 17 Mar 2020 06:56:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:33846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726452AbgCQK4V (ORCPT ); Tue, 17 Mar 2020 06:56:21 -0400 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 0FF0E20714; Tue, 17 Mar 2020 10:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442581; bh=SanQ3vDyH9uTO+yYf1cJEVS1/6HAU0Rq1i5TyLKQZyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SE0RYgO2f6M9L6DQtwmvtc5FijrvrZj/cnAZyslaOwD2eBxwaZEt0ZAXi10aqYuze GBVqeAe82OzYfkliHLegnZbpwyr+DgblpTwOooyQ0ghDZnKEGw8sKUgZi1+WZhehW/ QEJBOgMSzXe5oDqZNVKEvUPtZBlKMOQhhaCmVyUg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , "David S. Miller" Subject: [PATCH 4.19 12/89] netlink: Use netlink header as base to calculate bad attribute offset Date: Tue, 17 Mar 2020 11:54:21 +0100 Message-Id: <20200317103301.291918811@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103259.744774526@linuxfoundation.org> References: <20200317103259.744774526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pablo Neira Ayuso [ Upstream commit 84b3268027641401bb8ad4427a90a3cce2eb86f5 ] Userspace might send a batch that is composed of several netlink messages. The netlink_ack() function must use the pointer to the netlink header as base to calculate the bad attribute offset. Fixes: 2d4bc93368f5 ("netlink: extended ACK reporting") Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/netlink/af_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2411,7 +2411,7 @@ void netlink_ack(struct sk_buff *in_skb, in_skb->len)) WARN_ON(nla_put_u32(skb, NLMSGERR_ATTR_OFFS, (u8 *)extack->bad_attr - - in_skb->data)); + (u8 *)nlh)); } else { if (extack->cookie_len) WARN_ON(nla_put(skb, NLMSGERR_ATTR_COOKIE,