mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
d93fb604c0
commit 526f5b851a96566803ee4bee60d0a34df56c77f8 upstream.
Error message printed:
modprobe: ERROR: could not insert 'tipc': Address family not
supported by protocol.
when modprobe tipc after the following patch: switch order of
device registration, commit 7e27e8d6130c
("tipc: switch order of device registration to fix a crash")
Because sock_create_kern(net, AF_TIPC, ...) called by
tipc_topsrv_create_listener() in the initialization process
of tipc_init_net(), so tipc_socket_init() must be execute before that.
Meanwhile, tipc_net_id need to be initialized when sock_create()
called, and tipc_socket_init() is no need to be called for each namespace.
I add a variable tipc_topsrv_net_ops, and split the
register_pernet_subsys() of tipc into two parts, and split
tipc_socket_init() with initialization of pernet params.
By the way, I fixed resources rollback error when tipc_bcast_init()
failed in tipc_init_net().
Fixes: 7e27e8d6130c ("tipc: switch order of device registration to fix a crash")
Signed-off-by: Junwei Hu <hujunwei4@huawei.com>
Reported-by: Wang Wang <wangwang2@huawei.com>
Reported-by: syzbot+1e8114b61079bfe9cbc5@syzkaller.appspotmail.com
Reviewed-by: Kang Zhou <zhoukang7@huawei.com>
Reviewed-by: Suanming Mou <mousuanming@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
86 lines
3.4 KiB
C
86 lines
3.4 KiB
C
/*
|
|
* net/tipc/subscr.h: Include file for TIPC network topology service
|
|
*
|
|
* Copyright (c) 2003-2006, Ericsson AB
|
|
* Copyright (c) 2005-2007, 2012-2013, Wind River Systems
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the names of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
* Software Foundation.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _TIPC_SUBSCR_H
|
|
#define _TIPC_SUBSCR_H
|
|
|
|
#include "server.h"
|
|
|
|
#define TIPC_MAX_SUBSCRIPTIONS 65535
|
|
#define TIPC_MAX_PUBLICATIONS 65535
|
|
|
|
struct tipc_subscription;
|
|
struct tipc_subscriber;
|
|
|
|
/**
|
|
* struct tipc_subscription - TIPC network topology subscription object
|
|
* @subscriber: pointer to its subscriber
|
|
* @seq: name sequence associated with subscription
|
|
* @net: point to network namespace
|
|
* @timer: timer governing subscription duration (optional)
|
|
* @nameseq_list: adjacent subscriptions in name sequence's subscription list
|
|
* @subscrp_list: adjacent subscriptions in subscriber's subscription list
|
|
* @swap: indicates if subscriber uses opposite endianness in its messages
|
|
* @evt: template for events generated by subscription
|
|
*/
|
|
struct tipc_subscription {
|
|
struct kref kref;
|
|
struct tipc_subscriber *subscriber;
|
|
struct net *net;
|
|
struct timer_list timer;
|
|
struct list_head nameseq_list;
|
|
struct list_head subscrp_list;
|
|
int swap;
|
|
struct tipc_event evt;
|
|
};
|
|
|
|
int tipc_subscrp_check_overlap(struct tipc_name_seq *seq, u32 found_lower,
|
|
u32 found_upper);
|
|
void tipc_subscrp_report_overlap(struct tipc_subscription *sub,
|
|
u32 found_lower, u32 found_upper, u32 event,
|
|
u32 port_ref, u32 node, int must);
|
|
void tipc_subscrp_convert_seq(struct tipc_name_seq *in, int swap,
|
|
struct tipc_name_seq *out);
|
|
u32 tipc_subscrp_convert_seq_type(u32 type, int swap);
|
|
|
|
int __net_init tipc_topsrv_init_net(struct net *net);
|
|
void __net_exit tipc_topsrv_exit_net(struct net *net);
|
|
|
|
void tipc_subscrp_put(struct tipc_subscription *subscription);
|
|
void tipc_subscrp_get(struct tipc_subscription *subscription);
|
|
|
|
#endif
|