Re: PROBLEM: null-ptr deref in ip_options_echo may lead to denial of service

On Mon, 2017-03-20 at 12:59 +0800, Anarcheuz Fritz wrote: > Hi David, > > > While working on some legacy kernel I stumbled upon a null-ptr deref in > ip_options_echo. The bug has been verified on the latest version > 3.2.87 from the supported long-term branch. > Fixed in commit

linux-next: manual merge of the akpm tree with the net-next tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt between commit: 0ce5aa1d6c97 ("dt-bindings: net: update bcmgenet binding for GENETv5") from the net-next tree and patch: "scripts/spelling.txt: Add

[PATCH net-next] neighbour: fix nlmsg_pid in notifications

From: Roopa Prabhu neigh notifications today carry pid 0 for nlmsg_pid in all cases. This patch fixes it to carry calling process pid when available. Applications (eg. quagga) rely on nlmsg_pid to ignore notifications generated by their own netlink operations. This

PROBLEM: null-ptr deref in ip_options_echo may lead to denial of service

Hi David, While working on some legacy kernel I stumbled upon a null-ptr deref in ip_options_echo. The bug has been verified on the latest version 3.2.87 from the supported long-term branch. Description === The 2 setsockopt in the reproducer are required in order to reach the code

Re: [PATCH net v2] net: Do not hold the reference for the same sk_rx_dst

On Sat, Mar 18, 2017 at 9:03 PM, Kaiwen Xu wrote: > On Sat, Mar 18, 2017 at 08:49:43PM -0700, Cong Wang wrote: >> On Sat, Mar 18, 2017 at 6:48 PM, Kevin Xu wrote: >> > In some rare cases, inet_sk_rx_dst_set() may be called multiple times >> > on the same

Re: SO_BINDTODEVICE in VRFs not working?

On 3/18/17 4:28 AM, Rami Rosen wrote: > Hi, > >> Bind to the VRF device not an interface enslaved to it. I want to add >> the option for enslaved interfaces but have not gotten around to it. > > Maybe this should be added as a note/TBD to the VRF documentation > (which does mention setsockopt

[PATCH nf 1/1] netfilter: snmp: Fix one possible panic when snmp_trap_helper fail to register

From: Gao Feng In the commit ("netfilter: nf_conntrack: nf_conntrack snmp helper"), the snmp_helper is replaced by nf_nat_snmp_hook. So the snmp_helper is never registered. But it still tries to unregister the snmp_helper, it could cause the panic. Now remove the useless

[PATCH net-next v4 3/3] A Sample of using socket cookie and uid for traffic monitoring

From: Chenbo Feng Add a sample program to demostrate the possible usage of get_socket_cookie and get_socket_uid helper function. The program will store bytes and packets counting of in/out traffic monitored by iptables and store the stats in a bpf map in per socket base. The

[PATCH net-next v4 1/3] Add a helper function to get socket cookie in eBPF

From: Chenbo Feng Retrieve the socket cookie generated by sock_gen_cookie() from a sk_buff with a known socket. Generates a new cookie if one was not yet set.If the socket pointer inside sk_buff is NULL, 0 is returned. The helper function coud be useful in monitoring per socket

[PATCH net-next v4 2/3] Add a eBPF helper function to retrieve socket uid

From: Chenbo Feng Returns the owner uid of the socket inside a sk_buff. This is useful to perform per-UID accounting of network traffic or per-UID packet filtering. The socket need to be a fullsock otherwise overflowuid is returned. Signed-off-by: Chenbo Feng

[PATCH net-next v4 0/3] net: core: Two Helper function about socket information

Introduce two eBpf helper function to get the socket cookie and socket uid for each packet. The helper function is useful when the *sk field inside sk_buff is not empty. These helper functions can be used on socket and uid based traffic monitoring programs. Change since V3: * Fixed some typos and

linux-next: manual merge of the net-next tree with the net tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/hyperv/netvsc.c between commit: e14b4db7a567 ("netvsc: fix race during initialization") from the net tree and commits: 0d6dd35784e7 ("netvsc: need napi scheduled during removal") 6de38af611ca

Re: [PATCH 2/4] flowcache: make flow_cache_hash_size() return "unsigned int"

On Mon, 2017-03-20 at 01:24 +0300, Alexey Dobriyan wrote: > Hash size can't negative so "unsigned int" is logically correct. > struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu); > - size_t sz = sizeof(struct hlist_head) * flow_cache_hash_size(fc); > + unsigned int sz =

Re: [PATCH 3/4] flowcache: make struct flow_cache_percpu::hash_rnd_recalc bool

On Mon, 2017-03-20 at 01:27 +0300, Alexey Dobriyan wrote: > ->hash_rnd_recalc is only used in boolean context. > > Space savings on x86_64 come from the fact that "MOV rm8, imm8" is > shorter than "MOV rm32, imm32" by at least 3 bytes. > > add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-10

[PATCH 4/4] flowcache: more "unsigned int" in struct flow_cache_percpu

Make ->hash_count, ->low_watermark and ->high_watermark unsigned int and propagate unsignedness to other variables. This doesn't change code generation because these fields aren't used in 64-bit contexts but make it anyway: these fields can't be negative numbers. Signed-off-by: Alexey Dobriyan

Re: [PATCH RFC 0/7] phylib MMD accessor cleanups

Le 03/19/17 à 03:59, Russell King - ARM Linux a écrit : > Hi, > > This series cleans up the phylib MMD accessors. We have two accessors > at present, phy_(read|write)_mmd() and phy_(read|write)_mmd_indirect() > > The _indirect methods access the MMD registers via a clause 22 phy, > whereas the

[PATCH 3/4] flowcache: make struct flow_cache_percpu::hash_rnd_recalc bool

->hash_rnd_recalc is only used in boolean context. Space savings on x86_64 come from the fact that "MOV rm8, imm8" is shorter than "MOV rm32, imm32" by at least 3 bytes. add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-10 (-10) function old new

[PATCH 2/4] flowcache: make flow_cache_hash_size() return "unsigned int"

Hash size can't negative so "unsigned int" is logically correct. Propagate "unsigned int" to loop counters. Space savings: add/remove: 0/0 grow/shrink: 2/2 up/down: 6/-18 (-12) function old new delta flow_cache_flush_tasklet

[PATCH 1/4] flowcache: make flow_key_size() return "unsigned int"

flow keys aren't 4GB+ numbers so 64-bit arithmetic is excessive. Space savings (I'm not sure what is CSWTCH): add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-48 (-48) function old new delta flow_cache_lookup

Re: "TCP: eth0: Driver has suspect GRO implementation, TCP performance may be compromised." message with "ethtool -K eth0 gro off"

On Sun, 2017-03-19 at 13:14 +0100, Markus Trippelsdorf wrote: > On 2017.02.06 at 19:12 -0200, Marcelo Ricardo Leitner wrote: > > On Fri, Feb 03, 2017 at 06:47:33AM -0800, Eric Dumazet wrote: > > > On Fri, 2017-02-03 at 12:28 -0200, Marcelo Ricardo Leitner wrote: > > > > > > > Aren't you mixing

Re: [PATCH net-next v2] net: Add sysctl to toggle early demux for tcp and udp

On Sat, 2017-03-18 at 20:07 -0600, Subash Abhinov Kasiviswanathan wrote: > > Less than 1% performance improvement in a benchmark doesn't justify > > the complexity of the patch. Eric's hypothesis was that an unconnected > > UDP socket may show issues because of cache misses in look-ups due to > >

Re: [PATCH RFC 3/7] net: lan78xx: update for phy_(read|write)_mmd_indirect() removal

On Sun, Mar 19, 2017 at 11:00:29AM +, Russell King wrote: > lan78xx appears to use phylib in a rather weird way, accessing the PHY > partly through phylib, and partly by makign direct accesses to it, Hi Russell s/makign/making Andrew

Re: [PATCH] net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4

* Bjørn Mork [170319 10:23]: > Tony Lindgren writes: > > And the v3.8 kernel also has drivers/usb/serial/mdm6600.c: > > > > +static const struct usb_device_id mdm6600_id_table[] = { > > + { USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x2a70, 0xff, 0xff, 0xff) },

Re: [PATCH] net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4

Tony Lindgren writes: > * Bjørn Mork [170319 09:33]: >> Tony Lindgren writes: >> >> > This gets qmicli working with the MDM6600 modem. >> > >> > Cc: Bjørn Mork >> > Reviewed-by: Sebastian Reichel >> >

[PATCH v6 15/15] PCI: Remove PCI pool macro functions

Now that all the drivers use dma pool API, we can remove the macro functions for PCI pool. Signed-off-by: Romain Perier Reviewed-by: Peter Senna Tschudin --- include/linux/pci.h | 9 - 1 file changed, 9 deletions(-) diff --git

Re: [PATCH] net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4

* Tony Lindgren [170319 10:05]: > * Bjørn Mork [170319 09:33]: > > This is a bit unusual, so I'd like to verify that it is correct. Do you > > happen to have a "lsusb -v" or /sys/kernel/debug/usb/devices dump for > > this device? Is this usage of vendor + class

[PATCH v6 14/15] scsi: pmcraid: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Acked-by: Peter Senna Tschudin Tested-by: Peter Senna Tschudin

[PATCH v6 06/15] mlx5: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Reviewed-by: Peter Senna Tschudin --- drivers/net/ethernet/mellanox/mlx5/core/cmd.c

[PATCH v6 01/15] block: DAC960: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Acked-by: Peter Senna Tschudin Tested-by: Peter Senna Tschudin

[PATCH v6 00/15] Replace PCI pool by DMA pool API

The current PCI pool API are simple macro functions direct expanded to the appropriate dma pool functions. The prototypes are almost the same and semantically, they are very similar. I propose to use the DMA pool API directly and get rid of the old API. This set of patches, replaces the old API

[PATCH v6 03/15] IB/mthca: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Acked-by: Peter Senna Tschudin Tested-by: Peter Senna Tschudin

[PATCH v6 05/15] mlx4: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Acked-by: Peter Senna Tschudin Tested-by: Peter Senna Tschudin

[PATCH v6 02/15] dmaengine: pch_dma: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Acked-by: Peter Senna Tschudin Tested-by: Peter Senna Tschudin

[PATCH v6 04/15] net: e100: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Acked-by: Peter Senna Tschudin Acked-by: Jeff Kirsher

[PATCH v6 10/15] scsi: lpfc: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. It also updates some comments, accordingly. Signed-off-by: Romain Perier Reviewed-by: Peter Senna Tschudin ---

[PATCH v6 09/15] scsi: csiostor: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. It also updates the name of some variables and the content of comments, accordingly. Signed-off-by: Romain Perier Reviewed-by: Peter Senna

[PATCH v6 08/15] scsi: be2iscsi: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Acked-by: Peter Senna Tschudin Tested-by: Peter Senna Tschudin

[PATCH v6 11/15] scsi: megaraid: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Reviewed-by: Peter Senna Tschudin Acked-by: Sumit Saxena

[PATCH v6 07/15] wireless: ipw2200: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Reviewed-by: Peter Senna Tschudin --- drivers/net/wireless/intel/ipw2x00/ipw2200.c |

[PATCH v6 13/15] scsi: mvsas: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Reviewed-by: Peter Senna Tschudin --- drivers/scsi/mvsas/mv_init.c | 6 +++---

[PATCH v6 12/15] scsi: mpt3sas: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old API by the appropriate function with the DMA pool API. Signed-off-by: Romain Perier Reviewed-by: Peter Senna Tschudin --- drivers/scsi/mpt3sas/mpt3sas_base.c | 73

Re: [PATCH] net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4

Tony Lindgren writes: > This gets qmicli working with the MDM6600 modem. > > Cc: Bjørn Mork > Reviewed-by: Sebastian Reichel > Tested-by: Sebastian Reichel > Signed-off-by: Tony Lindgren > --- >

Re: [PATCH] net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4

* Bjørn Mork [170319 09:33]: > Tony Lindgren writes: > > > This gets qmicli working with the MDM6600 modem. > > > > Cc: Bjørn Mork > > Reviewed-by: Sebastian Reichel > > Tested-by: Sebastian Reichel > >

Re: [PATCH RFC 0/7] phylib MMD accessor cleanups

On Sun, Mar 19, 2017 at 10:59:44AM +, Russell King - ARM Linux wrote: > Hi, > > This series cleans up the phylib MMD accessors. We have two accessors > at present, phy_(read|write)_mmd() and phy_(read|write)_mmd_indirect() > > The _indirect methods access the MMD registers via a clause 22

Re: [PATCH net] bridge: ebtables: fix reception of frames DNAT-ed to bridge device

On Fri, Mar 17, 2017 at 02:10:44PM +0100, Pablo Neira Ayuso wrote: > Wait. > > May this break local multicast listener that are bound to the bridge > interface? Assuming the bridge interface got an IP address, and that > there is local multicast listener. > > Missing anything here? Hm, for

Google Summer of Code: WireGuard & kernel hacking

Hey guys, WireGuard is accepting students for Google Summer of Code. If you're a student and want to spend the summer writing kernel networking code, cryptography code, security code, and all sorts of interesting things, this might be somewhat appealing to you. A few project ideas are listed

Re: [PATCH v4 2/2] can: spi: hi311x: Add Holt HI-311x CAN driver

Hello Akshay, I still see some improvements... Am 17.03.2017 um 22:10 schrieb Akshay Bhat: This patch adds support for the Holt HI-311x CAN controller. The HI311x CAN controller is capable of transmitting and receiving standard data frames, extended data frames and remote frames. The HI311x

[PATCH] net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4

This gets qmicli working with the MDM6600 modem. Cc: Bjørn Mork Reviewed-by: Sebastian Reichel Tested-by: Sebastian Reichel Signed-off-by: Tony Lindgren --- drivers/net/usb/qmi_wwan.c | 4 1 file changed, 4 insertions(+)

Re: [PATCH v3 0/4] Introduce a new helper for parsing ipv[4|6]:port to socket address

Changes from v1: - rebased to 4.11-rc1 - improved changelogs Changes from v0: - rebased on 4.10 - splitted inet_pton_with_scope to be a bit saner (from Chrsitoph) - converted nvme-rdma host_traddr to use a generic helper We have some places in the stack that support ipv4 and ipv6. In some

Re: Passionate Partner

Dear Sir, Did you recieved my mail? I have sent it twice without a response. Castano Giovanni

Re: "TCP: eth0: Driver has suspect GRO implementation, TCP performance may be compromised." message with "ethtool -K eth0 gro off"

On 2017.02.06 at 19:12 -0200, Marcelo Ricardo Leitner wrote: > On Fri, Feb 03, 2017 at 06:47:33AM -0800, Eric Dumazet wrote: > > On Fri, 2017-02-03 at 12:28 -0200, Marcelo Ricardo Leitner wrote: > > > > > Aren't you mixing the endpoints here? MSS is the largest amount of data > > > that the peer

[PATCH ethtool] ethtool: Fix SFF 8079 cable technology bit parsing

According to the transceiver compliance code definition in the spec, bits 2 & 3 in the 8th byte are indication of active/passive cable, and not specifically related to FC/copper. Fixes: 2edf56749abe ("ethtool: Addition of -m option to dump module eeprom") Signed-off-by: Gal Pressman

[PATCH RFC 3/7] net: lan78xx: update for phy_(read|write)_mmd_indirect() removal

lan78xx appears to use phylib in a rather weird way, accessing the PHY partly through phylib, and partly by makign direct accesses to it, including to the Clause 45 registers. As the indirect MMD accessors are going away, update this driver to use the plain phy_(read|write)_mmd() accessors

[PATCH RFC 7/7] net: phy: clean up mmd_phy_indirect()

Make mmd_phy_indirect() use the same terminology as the rest of the code, making clear what each address is - phy address, devad, and register number. While here, remove the "inline" from this static function, leaving it to the compiler to decide whether to inline this function, and get rid of

[PATCH RFC 5/7] net: phy: convert micrel to new read_mmd/write_mmd driver methods

Convert micrel to the new read_mmd/write_mmd driver methods. This Clause 22 PHY does not support any MMD access method. Signed-off-by: Russell King --- drivers/net/phy/micrel.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git

[PATCH RFC 2/7] net: phy: make phy_(read|write)_mmd() generic MMD accessors

Make phy_(read|write)_mmd() generic 802.3 clause 45 register accessors for both Clause 22 and Clause 45 PHYs, using either the direct register reading for Clause 45, or the indirect method for Clause 22 PHYs. Allow this behaviour to be overriden by PHY drivers where necessary. Signed-off-by:

[PATCH RFC 1/7] net: phy: move phy MMD accessors to phy-core.c

Move the phy_(read|write)__mmd() helpers out of line, they will become our main MMD accessor functions, and so will be a little more complex. This complexity doesn't belong in an inline function. Also move the _indirect variants as well to keep like functionality together. Signed-off-by: Russell

[PATCH RFC 6/7] net: phy: remove the indirect MMD read/write methods

Remove the indirect MMD read/write methods which are now no longer necessary. Signed-off-by: Russell King --- drivers/net/phy/phy-core.c | 119 + include/linux/phy.h| 42 2 files changed, 35

[PATCH RFC 4/7] net: phy: switch remaining users to phy_(read|write)_mmd()

Switch everyone over to using phy_read_mmd() and phy_write_mmd() now that they are able to handle both Clause 22 indirect addressing and Clause 45 direct addressing methods to the MMD registers. Signed-off-by: Russell King --- drivers/net/phy/bcm-phy-lib.c | 12

[PATCH net-next 9/9] qed: Always publish VF link from leading hwfn

The link information exists only on the leading hwfn, but some of its derivatives [e.g., min/max rate] need to be configured for each hwfn. When re-basing the VF link view, use the leading hwfn information as basis for all existing hwfns to allow said configurations to stick. Signed-off-by: Yuval

[PATCH net-next 2/9] qed: Clean VF malicious indication when disabling IOV

When a VF is considered malicious, driver handling of the VF FLR flow would clean said indication - but not if the FLR is part of an sriov-disable flow. That leads to further issues, as PF wouldn't re-enable the previously malicious VF when sriov is re-enabled. No reason for that - simply clean

[PATCH net-next 4/9] qed: Correct default VF coalescing configuration

When starting the VF's vport, the PF would first configure the status blocks of the VF and then reset them. That would cause some of the configured information to be lost - specifically it would mean that all the VFs queues would use the Rx coalescing state-machine of the status block.

[PATCH net-next 8/9] qed: Raise verbosity of Malicious VF indications

Malicious VF existance should be interesting enough for the hyperuser. Change the PF indication that one of its child VF became malicious to appear by default. Signed-off-by: Yuval Mintz --- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 14 ++ 1 file changed,

[PATCH net-next 5/9] qed: Uniform IOV queue validation

PF needs to validate the status of VF queues before asking firmware to configure anything for them, but that validation is done in various different forms - sometimes inadequate. Add auxillary functions that can be used for testing of the queue state and convert the various flows to use those

[PATCH net-next 6/9] qed: Deprecate VF multiple queue-stop

The PF<->VF interface allows for the VF to request multiple queues closure via a single message, but this has never been used by any official driver. We now deprecate this option, forcing each queue close to arrive via a different command; This would be required for future TLVs that are going to

[PATCH net-next 7/9] qed: Make qed_iov_mark_vf_flr() return bool

Signed-off-by: Yuval Mintz --- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 9 + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 10 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c

[PATCH net-next 0/9] qed: IOV related clenaups

This patch series targets IOV functionality [on both PF and VF]. Patches #2, #3 and #5 fix flows relating to malicious VFs, either by upgrading and aligning current safe-guards or by correcing racy flows. Patches #1 and #8 make some malicious/dysnfunctional VFs logging appear by default in logs.

[PATCH net-next 1/9] qed: Increase verbosity of VF -> PF errors

VFs are currently logging errors when communicating with their PFs in a too-low verbosity that wouldn't be shown by default. As timeouts and failed commands are crucial for VF operability, make them appear by default. Signed-off-by: Yuval Mintz ---

[PATCH net-next 3/9] qed: Set HW-channel to ready before ACKing VF

When PF responds to the VF requests it also cleans the HW-channel indication in firmware to allow further VF messages to arrive, but the order currently applied is wrong - The PF is copying by DMAE the response the VF is polling on for completion, and only afterwards sets the HW-channel to ready

[PATCH RFC 0/7] phylib MMD accessor cleanups

Hi, This series cleans up the phylib MMD accessors. We have two accessors at present, phy_(read|write)_mmd() and phy_(read|write)_mmd_indirect() The _indirect methods access the MMD registers via a clause 22 phy, whereas the non-_indirect methods acess via clause 45 accesses. Current

Re: [PATCH net-next 1/2] tcp: remove per-destination timestamp cache

On Wed, Mar 15, 2017 at 05:06:58PM -0700, Eric Dumazet wrote: > > Nat are good, Nat are good. > > I can't find this hilarious video we watched in Copenhagen ;) > Maybe 'Oops, I did it: IPv6 NAT by Patrick McHardy'[0]. Starts around 19:10. [0]:

[PATCH net] selftests/bpf: fix broken build, take 2

Merge of 'linux-kselftest-4.11-rc1': 1. Partially removed use of 'test_objs' target, breaking force rebuild of BPFOBJ, introduced in commit d498f8719a09 ("bpf: Rebuild bpf.o for any dependency update"). Update target so dependency on BPFOBJ is restored. 2. Introduced commit 2047f1d8ba28