Merge pull request #2 from coolsnowwolf/master

tbym

include/kernel-6.12

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .1
-LINUX_KERNEL_HASH-6.12.1 = 0193b1d86dd372ec891bae799f6da20deef16fc199f30080a4ea9de8cef0c619
+LINUX_VERSION-6.12 = .3
+LINUX_KERNEL_HASH-6.12.3 = c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae

package/kernel/ksmbd/Makefile

@@ -42,8 +42,27 @@ endef
 # The last two DEPENDS are hacks in order to get CONFIG_ASN1 and CONFIG_OID_REGISTRY
 # which it seems can't be selected independently. Some bug in either base or upstream.
 
+define KernelPackage/fs-ksmbd/description
+  Ksmbd is an In-kernel SMBv(1)2/3 fileserver.
+  It's an implementation of the SMB protocol in kernel space for sharing files and IPC services over network.
+endef
+define KernelPackage/fs-ksmbd/config
+config KSMBD_SMB_INSECURE_SERVER
+	bool "Support for insecure SMB1/CIFS and SMB2.0 protocols"
+	depends on PACKAGE_kmod-fs-ksmbd
+	help
+		This enables deprecated insecure protocols dialects: SMB1/CIFS and SMB2.0.
+	default n
+endef
+ifeq ($(CONFIG_KSMBD_SMB_INSECURE_SERVER),y)
+PKG_EXTRA_KCONFIG:=CONFIG_SMB_INSECURE_SERVER=y
+EXTRA_CFLAGS += -DCONFIG_SMB_INSECURE_SERVER=1
+endif
+
 define Build/Compile
 	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(PKG_EXTRA_KCONFIG) \
 	CONFIG_SMB_SERVER=m \
 	modules
 endef

package/kernel/ksmbd/patches/02-linux-is_dot_dotdot.patch

@@ -5,7 +5,7 @@
  #endif
 
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 60)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 110)
  static inline bool is_dot_dotdot(const char *name, size_t len)
  {
  	return len && unlikely(name[0] == '.') &&

target/linux/generic/hack-6.12/253-ksmbd-config.patch

@@ -1,6 +1,6 @@
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -2030,7 +2030,7 @@ config PADATA
+@@ -2043,7 +2043,7 @@ config PADATA
  	bool
 
  config ASN1

target/linux/generic/hack-6.12/410-block-fit-partition-parser.patch

@@ -1,6 +1,6 @@
 --- a/block/blk.h
 +++ b/block/blk.h
-@@ -558,6 +558,8 @@ void blk_free_ext_minor(unsigned int min
+@@ -564,6 +564,8 @@ void blk_free_ext_minor(unsigned int min
  #define ADDPART_FLAG_NONE	0
  #define ADDPART_FLAG_RAID	1
  #define ADDPART_FLAG_WHOLEDISK	2

target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch

@@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -712,8 +712,6 @@ config NFT_REJECT_NETDEV
+@@ -715,8 +715,6 @@ config NFT_REJECT_NETDEV
 
  endif # NF_TABLES_NETDEV
 
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  config NF_FLOW_TABLE_INET
  	tristate "Netfilter flow table mixed IPv4/IPv6 module"
  	depends on NF_FLOW_TABLE
-@@ -722,11 +720,12 @@ config NF_FLOW_TABLE_INET
+@@ -725,11 +723,12 @@ config NF_FLOW_TABLE_INET
 
  	  To compile it as a module, choose M here.
 

target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1082,6 +1082,7 @@ static const struct usb_device_id produc
+@@ -1083,6 +1083,7 @@ static const struct usb_device_id produc
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},	/* Quectel EM160R-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},	/* Quectel RM500Q-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},	/* Quectel RM520N */
@@ -19,7 +19,7 @@
 
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1199,6 +1201,11 @@ static const struct usb_device_id option
+@@ -1201,6 +1203,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },

target/linux/generic/hack-6.12/902-debloat_proc.patch

@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (!pe)
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -2192,10 +2192,12 @@ void __init init_mm_internals(void)
+@@ -2194,10 +2194,12 @@ void __init init_mm_internals(void)
  	start_shepherd_timer();
  #endif
  #ifdef CONFIG_PROC_FS
@@ -319,7 +319,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -4223,6 +4223,8 @@ static __net_initdata struct pernet_oper
+@@ -4229,6 +4229,8 @@ static __net_initdata struct pernet_oper
 
  static int __init proto_init(void)
  {

target/linux/generic/hack-6.12/904-debloat_dma_buf.patch

@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +dma-shared-buffer-objs :=  $(dma-buf-objs-y)
 --- a/drivers/dma-buf/dma-buf.c
 +++ b/drivers/dma-buf/dma-buf.c
-@@ -1731,4 +1731,5 @@ static void __exit dma_buf_deinit(void)
+@@ -1743,4 +1743,5 @@ static void __exit dma_buf_deinit(void)
  	kern_unmount(dma_buf_mnt);
  	dma_buf_uninit_sysfs_statistics();
  }
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4487,6 +4487,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4419,6 +4419,7 @@ int wake_up_state(struct task_struct *p,
  {
  	return try_to_wake_up(p, state, 0);
  }

target/linux/generic/hack-6.12/920-device_tree_cmdline.patch

@@ -1,6 +1,6 @@
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1051,6 +1051,9 @@ int __init early_init_dt_scan_chosen(cha
+@@ -1052,6 +1052,9 @@ int __init early_init_dt_scan_chosen(cha
  	p = of_get_flat_dt_prop(node, "bootargs", &l);
  	if (p != NULL && l > 0)
  		strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));

target/linux/generic/hack-6.12/952-add-net-conntrack-events-support-multiple-registrant.patch

@@ -123,7 +123,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2801,6 +2801,10 @@ int nf_conntrack_init_net(struct net *ne
+@@ -2750,6 +2750,10 @@ int nf_conntrack_init_net(struct net *ne
  	nf_conntrack_ecache_pernet_init(net);
  	nf_conntrack_proto_pernet_init(net);
 
@@ -299,7 +299,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c
-@@ -723,12 +723,19 @@ static size_t ctnetlink_nlmsg_size(const
+@@ -721,12 +721,19 @@ static size_t ctnetlink_nlmsg_size(const
  }
 
  static int
@@ -319,7 +319,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	struct nf_conn *ct = item->ct;
  	struct sk_buff *skb;
  	unsigned int type;
-@@ -3750,11 +3757,17 @@ static int ctnetlink_stat_exp_cpu(struct
+@@ -3754,11 +3761,17 @@ static int ctnetlink_stat_exp_cpu(struct
  }
 
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
@@ -337,7 +337,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
 
  static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
  	[IPCTNL_MSG_CT_NEW]	= {
-@@ -3853,8 +3866,12 @@ static int __net_init ctnetlink_net_init
+@@ -3857,8 +3870,12 @@ static int __net_init ctnetlink_net_init
  static void ctnetlink_net_pre_exit(struct net *net)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS

target/linux/generic/hack-6.12/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

@@ -1,6 +1,6 @@
 --- a/include/linux/if_bridge.h
 +++ b/include/linux/if_bridge.h
-@@ -72,6 +72,9 @@ void brioctl_set(int (*hook)(struct net
+@@ -71,6 +71,9 @@ void brioctl_set(int (*hook)(struct net
  int br_ioctl_call(struct net *net, struct net_bridge *br, unsigned int cmd,
  		  struct ifreq *ifr, void __user *uarg);
 
@@ -12,7 +12,7 @@
  			       struct list_head *br_ip_list);
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1011,6 +1011,9 @@
+@@ -1011,6 +1011,9 @@ struct sk_buff {
  	__u8			csum_not_inet:1;
  #endif
  	__u8			unreadable:1;
@@ -35,7 +35,7 @@
  				   const struct nf_ct_event_notifier *nb);
 --- a/net/Kconfig
 +++ b/net/Kconfig
-@@ -504,6 +504,9 @@ config FAILOVER
+@@ -512,6 +512,9 @@ config FAILOVER
  	  migration of VMs with direct attached VFs by failing over to the
  	  paravirtual datapath when the VF is unplugged.
 
@@ -44,7 +44,7 @@
 +
  config ETHTOOL_NETLINK
  	bool "Netlink interface for ethtool"
- 	default y
+ 	select DIMLIB
 --- a/net/bridge/br_if.c
 +++ b/net/bridge/br_if.c
 @@ -764,6 +764,28 @@ void br_port_flags_change(struct net_bri
@@ -78,7 +78,7 @@
  	struct net_bridge_port *p;
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -3567,9 +3567,17 @@ static int xmit_one(struct sk_buff *skb,
+@@ -3579,9 +3579,17 @@ static int xmit_one(struct sk_buff *skb,
  {
  	unsigned int len;
  	int rc;
@@ -95,9 +95,9 @@
 +	}
 +#endif
 
- #ifdef CONFIG_ETHERNET_PACKET_MANGLE
- 	if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
-@@ -5308,6 +5316,11 @@ void netdev_rx_handler_unregister(struct
+ 	len = skb->len;
+ 	trace_net_dev_start_xmit(skb, dev);
+@@ -5417,6 +5425,11 @@ void netdev_rx_handler_unregister(struct
  }
  EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
 
@@ -109,7 +109,7 @@
  /*
   * Limit the use of PFMEMALLOC reserves to those protocols that implement
   * the special handling of PFMEMALLOC skbs.
-@@ -5356,6 +5369,10 @@ static int __netif_receive_skb_core(stru
+@@ -5465,6 +5478,10 @@ static int __netif_receive_skb_core(stru
  	int ret = NET_RX_DROP;
  	__be16 type;
 
@@ -120,7 +120,7 @@
  	net_timestamp_check(!READ_ONCE(net_hotdata.tstamp_prequeue), skb);
 
  	trace_netif_receive_skb(skb);
-@@ -5393,6 +5410,15 @@ another_round:
+@@ -5503,6 +5520,15 @@ another_round:
  			goto out;
  	}
 

target/linux/generic/hack-6.12/992-add-ndo-do-ioctl.patch

@@ -1,6 +1,6 @@
 --- a/net/wireless/wext-core.c
 +++ b/net/wireless/wext-core.c
-@@ -981,6 +981,9 @@ static int wireless_process_ioctl(struct
+@@ -984,6 +984,9 @@ static int wireless_process_ioctl(struct
  		else if (private)
  			return private(dev, iwr, cmd, info, handler);
  	}