From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50569 "EHLO
        out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1164840AbdD1Hp1 (ORCPT
        <rfc822;stable@vger.kernel.org>); Fri, 28 Apr 2017 03:45:27 -0400
Date: Fri, 28 Apr 2017 09:45:12 +0200
From: Greg KH <greg@kroah.com>
To: Jon Maloy <jon.maloy@ericsson.com>
Cc: stable@vger.kernel.org, parthasarathy.bhuvaragan@ericsson.com,
        ying.xue@windriver.com, tipc-discussion@lists.sourceforge.net
Subject: Re: [PATCH stable 4.4] tipc: move premature initialization of stack
 variables
Message-ID: <20170428074512.GB30203@kroah.com>
References: <1493324572-17567-1-git-send-email-jon.maloy@ericsson.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1493324572-17567-1-git-send-email-jon.maloy@ericsson.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Thu, Apr 27, 2017 at 10:22:52PM +0200, Jon Maloy wrote:
> From: Jon Paul Maloy <jon.maloy@ericsson.com>
> 
> commit 681a55d71799b575f46fe94121728cf67460d1c3 upstream
> 
> (Slightly modified to apply cleanly)

Belongs below the --- line.

> 
> In the function tipc_rcv() we initialize a couple of stack variables
> from the message header before that same header has been validated.
> In rare cases when the arriving header is non-linear, the validation
> function itself may linearize the buffer by calling skb_may_pull(),
> while the wrongly initialized stack fields are not updated accordingly.
> 
> We fix this in this commit.
> 
> Reported-by: Matthew Wong <mwong@sonusnet.com>
> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> 
> Conflicts:
> 	net/tipc/node.c

What are these lines for?  Please don't do that, "Conflicts:" lines do
not belong in the changelog as they don't make any sense, right?

thanks,

greg k-h