Subject: Re: [PATCH net v2] tipc: call tipc_rcv() only if bearer is up in
 tipc_udp_recv()
To: Ying Xue <ying.xue@windriver.com>, Jon Maloy <jon.maloy@ericsson.com>,
        "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org,
        tipc-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org
References: <20171129104842.30781-1-tommi.t.rantala@nokia.com>
 <213f64e0-d5c3-511f-b83a-c468c399abc1@windriver.com>
 <db905084-2c35-74e2-28d8-bc9d49a84527@nokia.com>
 <840ce8d1-7271-5189-4cfa-e40f4a0a4172@windriver.com>
From: Tommi Rantala <tommi.t.rantala@nokia.com>
Message-ID: <c110a0a9-4092-19aa-7d09-99e38d161663@nokia.com>
Date: Fri, 1 Dec 2017 16:02:47 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <840ce8d1-7271-5189-4cfa-e40f4a0a4172@windriver.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2017 14:02:52.8696 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 7f6f3a07-731a-4d97-6e59-08d538c43774
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB1325
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2171
Lines: 60

On 01.12.2017 15:18, Ying Xue wrote:
> On 11/30/2017 08:32 PM, Tommi Rantala wrote:
>>> In my opinion, the real root cause of the issue is because we too early
>>> set a not-yet-initialized bearer instance to ub->bearer through
>>> rcu_assign_pointer(ub->bearer, b) in tipc_udp_enable(). Instead if we
>>> assign the bearer pointer at the end of tipc_udp_enable() where the
>>> bearer has been completed the initialization, the issue would be avoided.
>> Hi, sorry, I fail to see how that helps.
>>
>> bearer->tolerance is only initialized in tipc_enable_bearer() after
>> calling m->enable_media() ie. tipc_udp_enable().
>>
>> So even if we do "rcu_assign_pointer(ub->bearer, b)" later in
>> tipc_udp_enable(), bearer->tolerance will still be uninitialized, and
>> the crash can happen.
> 
> Sorry, I missed the point that b->tolerance is not uninitialized when we
> assign bearer pointer to ub->bearer later.
> 
> But in my view the issue happened is because we enable media too early.
> So it's better to change the code as belows:

Thanks, looks good to me!

Tested in 4.4 (which does not have b->up), and this fixes the oops also 
there.

-Tommi


> diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
> index 47ec121..ec6f02a 100644
> --- a/net/tipc/bearer.c
> +++ b/net/tipc/bearer.c
> @@ -320,19 +320,18 @@ static int tipc_enable_bearer(struct net *net,
> const char *name,
> 
>          strcpy(b->name, name);
>          b->media = m;
> -       res = m->enable_media(net, b, attr);
> -       if (res) {
> -               pr_warn("Bearer <%s> rejected, enable failure (%d)\n",
> -                       name, -res);
> -               return -EINVAL;
> -       }
> -
>          b->identity = bearer_id;
>          b->tolerance = m->tolerance;
>          b->window = m->window;
>          b->domain = disc_domain;
>          b->net_plane = bearer_id + 'A';
>          b->priority = priority;
> +       res = m->enable_media(net, b, attr);
> +       if (res) {
> +               pr_warn("Bearer <%s> rejected, enable failure (%d)\n",
> +                       name, -res);
> +               return -EINVAL;
> +       }
>          test_and_set_bit_lock(0, &b->up);
>