Unverified Commit 54216dd6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6736 add LTS patches to OLK-5.10 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/I4ZIWB3C74BPZQYSM7RYWIZZSIWVLLC3/ 
Add LTS patches to OLK-5.10.

Ido Schimmel (3):
  genetlink: add CAP_NET_ADMIN test for multicast bind
  drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group
  genetlink: Use internal flags for multicast groups

Patrick Rohr (3):
  net: add sysctl accept_ra_min_rtr_lft
  net: change accept_ra_min_rtr_lft to affect all RA lifetimes
  net: release reference to inet6_dev pointer

Zhengchao Shao (2):
  genetlink: fix kabi change in struct genl_multicast_group
  net: fix kabi in struct ipv6_devconf


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I9K8D1 
 
Link:https://gitee.com/openeuler/kernel/pulls/6736

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents e3768967 76036b35

Documentation/networking/ip-sysctl.rst

+8 −0
Original line number Diff line number Diff line
@@ -1894,6 +1894,14 @@ accept_ra_min_hop_limit - INTEGER 


	Default: 1



accept_ra_min_lft - INTEGER

	Minimum acceptable lifetime value in Router Advertisement.



	RA sections with a lifetime less than this value shall be

	ignored. Zero lifetimes stay unaffected.



	Default: 0



accept_ra_pinfo - BOOLEAN

	Learn Prefix Information in Router Advertisement.

include/linux/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct ipv6_devconf { 


	struct ctl_table_header *sysctl_header;



	KABI_RESERVE(1)

	KABI_USE(1, __s32 accept_ra_min_lft)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

include/uapi/linux/ipv6.h

+7 −0
Original line number Diff line number Diff line
@@ -190,6 +190,13 @@ enum { 
	DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN,

	DEVCONF_NDISC_TCLASS,

	DEVCONF_RPL_SEG_ENABLED,

	DEVCONF_RA_DEFRTR_METRIC,

	DEVCONF_IOAM6_ENABLED,

	DEVCONF_IOAM6_ID,

	DEVCONF_IOAM6_ID_WIDE,

	DEVCONF_NDISC_EVICT_NOCARRIER,

	DEVCONF_ACCEPT_UNTRACKED_NA,

	DEVCONF_ACCEPT_RA_MIN_LFT,

	DEVCONF_MAX

};

net/core/drop_monitor.c

+3 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data) 
}



static const struct genl_multicast_group dropmon_mcgrps[] = {

	{ .name = "events", },

	{ .name = "events" },

};



static void send_dm_alert(struct work_struct *work)
@@ -1616,11 +1616,13 @@ static const struct genl_small_ops dropmon_ops[] = { 
		.cmd = NET_DM_CMD_START,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = net_dm_cmd_trace,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = NET_DM_CMD_STOP,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = net_dm_cmd_trace,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = NET_DM_CMD_CONFIG_GET,

net/ipv6/addrconf.c

+13 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = { 
	.accept_ra_defrtr	= 1,

	.accept_ra_from_local	= 0,

	.accept_ra_min_hop_limit= 1,

	.accept_ra_min_lft	= 0,

	.accept_ra_pinfo	= 1,

#ifdef CONFIG_IPV6_ROUTER_PREF

	.accept_ra_rtr_pref	= 1,
@@ -262,6 +263,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = { 
	.accept_ra_defrtr	= 1,

	.accept_ra_from_local	= 0,

	.accept_ra_min_hop_limit= 1,

	.accept_ra_min_lft	= 0,

	.accept_ra_pinfo	= 1,

#ifdef CONFIG_IPV6_ROUTER_PREF

	.accept_ra_rtr_pref	= 1,
@@ -2745,6 +2747,9 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) 
		return;

	}



	if (valid_lft != 0 && valid_lft < in6_dev->cnf.accept_ra_min_lft)

		goto put;



	/*

	 *	Two things going on here:

	 *	1) Add routes for on-link prefixes
@@ -5581,6 +5586,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, 
	array[DEVCONF_DISABLE_POLICY] = cnf->disable_policy;

	array[DEVCONF_NDISC_TCLASS] = cnf->ndisc_tclass;

	array[DEVCONF_RPL_SEG_ENABLED] = cnf->rpl_seg_enabled;

	array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;

}



static inline size_t inet6_ifla6_size(void)
@@ -6738,6 +6744,13 @@ static const struct ctl_table addrconf_sysctl[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "accept_ra_min_lft",

		.data		= &ipv6_devconf.accept_ra_min_lft,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "accept_ra_pinfo",

		.data		= &ipv6_devconf.accept_ra_pinfo,