Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad455d87 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.3-rc6 into android-mainline 



Linux 5.3-rc6

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Id10580d48d56054408b3efe0bd1866d67aba2a3d
parents a5bd47ef a55aa89a

Documentation/PCI/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Linux PCI Bus Subsystem 
   :numbered:



   pci

   picebus-howto

   pciebus-howto

   pci-iov-howto

   msi-howto

   acpi-info

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -4090,6 +4090,13 @@ 
			Run specified binary instead of /init from the ramdisk,

			used for early userspace startup. See initrd.



	rdrand=		[X86]

			force - Override the decision by the kernel to hide the

				advertisement of RDRAND support (this affects

				certain AMD processors because of buggy BIOS

				support, specifically around the suspend/resume

				path).



	rdt=		[HW,X86,RDT]

			Turn on/off individual RDT features. List is:

			cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,

Documentation/admin-guide/sysctl/net.rst

+1 −28
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ Table : Subdirectories in /proc/sys/net 
 802       E802 protocol         ax25       AX25

 ethernet  Ethernet protocol     rose       X.25 PLP layer

 ipv4      IP version 4          x25        X.25 protocol

 ipx       IPX                   token-ring IBM token ring

 bridge    Bridging              decnet     DEC net

 ipv6      IP version 6          tipc       TIPC

 ========= =================== = ========== ==================
@@ -401,33 +400,7 @@ interface. 
(network) that the route leads to, the router (may be directly connected), the

route flags, and the device the route is using.





5. IPX

------



The IPX protocol has no tunable values in proc/sys/net.



The IPX  protocol  does,  however,  provide  proc/net/ipx. This lists each IPX

socket giving  the  local  and  remote  addresses  in  Novell  format (that is

network:node:port). In  accordance  with  the  strange  Novell  tradition,

everything but the port is in hex. Not_Connected is displayed for sockets that

are not  tied to a specific remote address. The Tx and Rx queue sizes indicate

the number  of  bytes  pending  for  transmission  and  reception.  The  state

indicates the  state  the  socket  is  in and the uid is the owning uid of the

socket.



The /proc/net/ipx_interface  file lists all IPX interfaces. For each interface

it gives  the network number, the node number, and indicates if the network is

the primary  network.  It  also  indicates  which  device  it  is bound to (or

Internal for  internal  networks)  and  the  Frame  Type if appropriate. Linux

supports 802.3,  802.2,  802.2  SNAP  and DIX (Blue Book) ethernet framing for

IPX.



The /proc/net/ipx_route  table  holds  a list of IPX routes. For each route it

gives the  destination  network, the router node (or Directly) and the network

address of the router (or Connected) for internal networks.



6. TIPC

5. TIPC

-------



tipc_rmem

Documentation/networking/tls-offload.rst

+0 −18
Original line number Diff line number Diff line
@@ -506,21 +506,3 @@ Drivers should ignore the changes to TLS the device feature flags. 
These flags will be acted upon accordingly by the core ``ktls`` code.

TLS device feature flags only control adding of new TLS connection

offloads, old connections will remain active after flags are cleared.
 


Known bugs

==========



skb_orphan() leaks clear text

-----------------------------



Currently drivers depend on the :c:member:`sk` member of

:c:type:`struct sk_buff <sk_buff>` to identify segments requiring

encryption. Any operation which removes or does not preserve the socket

association such as :c:func:`skb_orphan` or :c:func:`skb_clone`

will cause the driver to miss the packets and lead to clear text leaks.



Redirects leak clear text

-------------------------



In the RX direction, if segment has already been decrypted by the device

and it gets redirected or mirrored - clear text will be transmitted out.