mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
Merge 5.4.248 into android11-5.4-lts
Changes in 5.4.248 test_firmware: fix a memory leak with reqs buffer KEYS: asymmetric: Copy sig and digest in public_key_verify_signature() dasd: refactor dasd_ioctl_information s390/dasd: Use correct lock while counting channel queue length power: supply: ab8500: Fix external_power_changed race power: supply: sc27xx: Fix external_power_changed race power: supply: bq27xxx: Use mod_delayed_work() instead of cancel() + schedule() ARM: dts: vexpress: add missing cache properties power: supply: Ratelimit no data debug output platform/x86: asus-wmi: Ignore WMI events with codes 0x7B, 0xC0 regulator: Fix error checking for debugfs_create_dir irqchip/meson-gpio: Mark OF related data as maybe unused power: supply: Fix logic checking if system is running from battery btrfs: handle memory allocation failure in btrfs_csum_one_bio parisc: Improve cache flushing for PCXL in arch_sync_dma_for_cpu() parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory() MIPS: Alchemy: fix dbdma2 mips: Move initrd_start check after initrd address sanitisation. xen/blkfront: Only check REQ_FUA for writes drm:amd:amdgpu: Fix missing buffer object unlock in failure path ocfs2: fix use-after-free when unmounting read-only filesystem ocfs2: check new file size on fallocate call nios2: dts: Fix tse_mac "max-frame-size" property nilfs2: fix incomplete buffer cleanup in nilfs_btnode_abort_change_key() nilfs2: fix possible out-of-bounds segment allocation in resize ioctl kexec: support purgatories with .text.hot sections powerpc/purgatory: remove PGO flags nouveau: fix client work fence deletion race RDMA/uverbs: Restrict usage of privileged QKEYs net: usb: qmi_wwan: add support for Compal RXM-G1 ALSA: hda/realtek: Add a quirk for Compaq N14JP6 Remove DECnet support from kernel USB: serial: option: add Quectel EM061KGL series serial: lantiq: add missing interrupt ack usb: dwc3: gadget: Reset num TRBs before giving back the request spi: spi-fsl-dspi: Remove unused chip->void_write_data spi: fsl-dspi: avoid SCK glitches with continuous transfers netfilter: nfnetlink: skip error delivery on batch in case of ENOMEM ping6: Fix send to link-local addresses with VRF. net/sched: cls_u32: Fix reference counter leak leading to overflow RDMA/rxe: Remove the unused variable obj RDMA/rxe: Removed unused name from rxe_task struct RDMA/rxe: Fix the use-before-initialization error of resp_pkts iavf: remove mask from iavf_irq_enable_queues() IB/uverbs: Fix to consider event queue closing also upon non-blocking mode IB/isert: Fix dead lock in ib_isert IB/isert: Fix possible list corruption in CMA handler IB/isert: Fix incorrect release of isert connection ipvlan: fix bound dev checking for IPv6 l3s mode sctp: fix an error code in sctp_sf_eat_auth() igb: fix nvm.ops.read() error handling drm/nouveau/dp: check for NULL nv_connector->native_mode drm/nouveau/kms: Don't change EDID when it hasn't actually changed drm/nouveau: add nv_encoder pointer check for NULL net/sched: cls_api: Fix lockup on flushing explicitly created chain net: lapbether: only support ethernet devices net: tipc: resize nlattr array to correct size selftests/ptp: Fix timestamp printf format for PTP_SYS_OFFSET afs: Fix vlserver probe RTT handling neighbour: Remove unused inline function neigh_key_eq16() net: Remove unused inline function dst_hold_and_use() neighbour: delete neigh_lookup_nodev as not used drm/nouveau/kms: Fix NULL pointer dereference in nouveau_connector_detect_depth mmc: block: ensure error propagation for non-blk Linux 5.4.248 Change-Id: Ie9ec82f0e64b95b2dcce2a754bc6e907c9231db3 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
commit
f4bff64ed2
111 changed files with 363 additions and 12379 deletions
|
|
@ -1,149 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
#ifndef _LINUX_DN_H
|
||||
#define _LINUX_DN_H
|
||||
|
||||
#include <linux/ioctl.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/if_ether.h>
|
||||
|
||||
/*
|
||||
|
||||
DECnet Data Structures and Constants
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
* DNPROTO_NSP can't be the same as SOL_SOCKET,
|
||||
* so increment each by one (compared to ULTRIX)
|
||||
*/
|
||||
#define DNPROTO_NSP 2 /* NSP protocol number */
|
||||
#define DNPROTO_ROU 3 /* Routing protocol number */
|
||||
#define DNPROTO_NML 4 /* Net mgt protocol number */
|
||||
#define DNPROTO_EVL 5 /* Evl protocol number (usr) */
|
||||
#define DNPROTO_EVR 6 /* Evl protocol number (evl) */
|
||||
#define DNPROTO_NSPT 7 /* NSP trace protocol number */
|
||||
|
||||
|
||||
#define DN_ADDL 2
|
||||
#define DN_MAXADDL 2 /* ULTRIX headers have 20 here, but pathworks has 2 */
|
||||
#define DN_MAXOPTL 16
|
||||
#define DN_MAXOBJL 16
|
||||
#define DN_MAXACCL 40
|
||||
#define DN_MAXALIASL 128
|
||||
#define DN_MAXNODEL 256
|
||||
#define DNBUFSIZE 65023
|
||||
|
||||
/*
|
||||
* SET/GET Socket options - must match the DSO_ numbers below
|
||||
*/
|
||||
#define SO_CONDATA 1
|
||||
#define SO_CONACCESS 2
|
||||
#define SO_PROXYUSR 3
|
||||
#define SO_LINKINFO 7
|
||||
|
||||
#define DSO_CONDATA 1 /* Set/Get connect data */
|
||||
#define DSO_DISDATA 10 /* Set/Get disconnect data */
|
||||
#define DSO_CONACCESS 2 /* Set/Get connect access data */
|
||||
#define DSO_ACCEPTMODE 4 /* Set/Get accept mode */
|
||||
#define DSO_CONACCEPT 5 /* Accept deferred connection */
|
||||
#define DSO_CONREJECT 6 /* Reject deferred connection */
|
||||
#define DSO_LINKINFO 7 /* Set/Get link information */
|
||||
#define DSO_STREAM 8 /* Set socket type to stream */
|
||||
#define DSO_SEQPACKET 9 /* Set socket type to sequenced packet */
|
||||
#define DSO_MAXWINDOW 11 /* Maximum window size allowed */
|
||||
#define DSO_NODELAY 12 /* Turn off nagle */
|
||||
#define DSO_CORK 13 /* Wait for more data! */
|
||||
#define DSO_SERVICES 14 /* NSP Services field */
|
||||
#define DSO_INFO 15 /* NSP Info field */
|
||||
#define DSO_MAX 15 /* Maximum option number */
|
||||
|
||||
|
||||
/* LINK States */
|
||||
#define LL_INACTIVE 0
|
||||
#define LL_CONNECTING 1
|
||||
#define LL_RUNNING 2
|
||||
#define LL_DISCONNECTING 3
|
||||
|
||||
#define ACC_IMMED 0
|
||||
#define ACC_DEFER 1
|
||||
|
||||
#define SDF_WILD 1 /* Wild card object */
|
||||
#define SDF_PROXY 2 /* Addr eligible for proxy */
|
||||
#define SDF_UICPROXY 4 /* Use uic-based proxy */
|
||||
|
||||
/* Structures */
|
||||
|
||||
|
||||
struct dn_naddr {
|
||||
__le16 a_len;
|
||||
__u8 a_addr[DN_MAXADDL]; /* Two bytes little endian */
|
||||
};
|
||||
|
||||
struct sockaddr_dn {
|
||||
__u16 sdn_family;
|
||||
__u8 sdn_flags;
|
||||
__u8 sdn_objnum;
|
||||
__le16 sdn_objnamel;
|
||||
__u8 sdn_objname[DN_MAXOBJL];
|
||||
struct dn_naddr sdn_add;
|
||||
};
|
||||
#define sdn_nodeaddrl sdn_add.a_len /* Node address length */
|
||||
#define sdn_nodeaddr sdn_add.a_addr /* Node address */
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* DECnet set/get DSO_CONDATA, DSO_DISDATA (optional data) structure
|
||||
*/
|
||||
struct optdata_dn {
|
||||
__le16 opt_status; /* Extended status return */
|
||||
#define opt_sts opt_status
|
||||
__le16 opt_optl; /* Length of user data */
|
||||
__u8 opt_data[16]; /* User data */
|
||||
};
|
||||
|
||||
struct accessdata_dn {
|
||||
__u8 acc_accl;
|
||||
__u8 acc_acc[DN_MAXACCL];
|
||||
__u8 acc_passl;
|
||||
__u8 acc_pass[DN_MAXACCL];
|
||||
__u8 acc_userl;
|
||||
__u8 acc_user[DN_MAXACCL];
|
||||
};
|
||||
|
||||
/*
|
||||
* DECnet logical link information structure
|
||||
*/
|
||||
struct linkinfo_dn {
|
||||
__u16 idn_segsize; /* Segment size for link */
|
||||
__u8 idn_linkstate; /* Logical link state */
|
||||
};
|
||||
|
||||
/*
|
||||
* Ethernet address format (for DECnet)
|
||||
*/
|
||||
union etheraddress {
|
||||
__u8 dne_addr[ETH_ALEN]; /* Full ethernet address */
|
||||
struct {
|
||||
__u8 dne_hiord[4]; /* DECnet HIORD prefix */
|
||||
__u8 dne_nodeaddr[2]; /* DECnet node address */
|
||||
} dne_remote;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* DECnet physical socket address format
|
||||
*/
|
||||
struct dn_addr {
|
||||
__le16 dna_family; /* AF_DECnet */
|
||||
union etheraddress dna_netaddr; /* DECnet ethernet address */
|
||||
};
|
||||
|
||||
#define DECNET_IOCTL_BASE 0x89 /* PROTOPRIVATE range */
|
||||
|
||||
#define SIOCSNETADDR _IOW(DECNET_IOCTL_BASE, 0xe0, struct dn_naddr)
|
||||
#define SIOCGNETADDR _IOR(DECNET_IOCTL_BASE, 0xe1, struct dn_naddr)
|
||||
#define OSIOCSNETADDR _IOW(DECNET_IOCTL_BASE, 0xe0, int)
|
||||
#define OSIOCGNETADDR _IOR(DECNET_IOCTL_BASE, 0xe1, int)
|
||||
|
||||
#endif /* _LINUX_DN_H */
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
#ifndef __LINUX_DECNET_NETFILTER_H
|
||||
#define __LINUX_DECNET_NETFILTER_H
|
||||
|
||||
/* DECnet-specific defines for netfilter.
|
||||
* This file (C) Steve Whitehouse 1999 derived from the
|
||||
* ipv4 netfilter header file which is
|
||||
* (C)1998 Rusty Russell -- This code is GPL.
|
||||
*/
|
||||
|
||||
#include <linux/netfilter.h>
|
||||
|
||||
/* only for userspace compatibility */
|
||||
#ifndef __KERNEL__
|
||||
|
||||
#include <limits.h> /* for INT_MIN, INT_MAX */
|
||||
|
||||
/* kernel define is in netfilter_defs.h */
|
||||
#define NF_DN_NUMHOOKS 7
|
||||
#endif /* ! __KERNEL__ */
|
||||
|
||||
/* DECnet Hooks */
|
||||
/* After promisc drops, checksum checks. */
|
||||
#define NF_DN_PRE_ROUTING 0
|
||||
/* If the packet is destined for this box. */
|
||||
#define NF_DN_LOCAL_IN 1
|
||||
/* If the packet is destined for another interface. */
|
||||
#define NF_DN_FORWARD 2
|
||||
/* Packets coming from a local process. */
|
||||
#define NF_DN_LOCAL_OUT 3
|
||||
/* Packets about to hit the wire. */
|
||||
#define NF_DN_POST_ROUTING 4
|
||||
/* Input Hello Packets */
|
||||
#define NF_DN_HELLO 5
|
||||
/* Input Routing Packets */
|
||||
#define NF_DN_ROUTE 6
|
||||
|
||||
enum nf_dn_hook_priorities {
|
||||
NF_DN_PRI_FIRST = INT_MIN,
|
||||
NF_DN_PRI_CONNTRACK = -200,
|
||||
NF_DN_PRI_MANGLE = -150,
|
||||
NF_DN_PRI_NAT_DST = -100,
|
||||
NF_DN_PRI_FILTER = 0,
|
||||
NF_DN_PRI_NAT_SRC = 100,
|
||||
NF_DN_PRI_DNRTMSG = 200,
|
||||
NF_DN_PRI_LAST = INT_MAX,
|
||||
};
|
||||
|
||||
struct nf_dn_rtmsg {
|
||||
int nfdn_ifindex;
|
||||
};
|
||||
|
||||
#define NFDN_RTMSG(r) ((unsigned char *)(r) + NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg)))
|
||||
|
||||
#ifndef __KERNEL__
|
||||
/* backwards compatibility for userspace */
|
||||
#define DNRMG_L1_GROUP 0x01
|
||||
#define DNRMG_L2_GROUP 0x02
|
||||
#endif
|
||||
|
||||
enum {
|
||||
DNRNG_NLGRP_NONE,
|
||||
#define DNRNG_NLGRP_NONE DNRNG_NLGRP_NONE
|
||||
DNRNG_NLGRP_L1,
|
||||
#define DNRNG_NLGRP_L1 DNRNG_NLGRP_L1
|
||||
DNRNG_NLGRP_L2,
|
||||
#define DNRNG_NLGRP_L2 DNRNG_NLGRP_L2
|
||||
__DNRNG_NLGRP_MAX
|
||||
};
|
||||
#define DNRNG_NLGRP_MAX (__DNRNG_NLGRP_MAX - 1)
|
||||
|
||||
#endif /*__LINUX_DECNET_NETFILTER_H*/
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
#define NETLINK_CONNECTOR 11
|
||||
#define NETLINK_NETFILTER 12 /* netfilter subsystem */
|
||||
#define NETLINK_IP6_FW 13
|
||||
#define NETLINK_DNRTMSG 14 /* DECnet routing messages */
|
||||
#define NETLINK_DNRTMSG 14 /* DECnet routing messages (obsolete) */
|
||||
#define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */
|
||||
#define NETLINK_GENERIC 16
|
||||
/* leave room for NETLINK_DM (DM Events) */
|
||||
|
|
|
|||
Loading…
Reference in a new issue