5.10.222-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 1/108 drm/lima: fix shared irq handling on driver remove
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Erico Nunes <[email protected]>
[ Upstream commit a6683c690bbfd1f371510cb051e8fa49507f3f5e ]
lima uses a shared interrupt, so the interrupt handlers must be prepared to be called at any time. At driver removal time, the clocks are disabled early and the interrupts stay registered until the very end of the remove process due to the devm usage.
This is potentially a bug as the interrupts access device registers which assumes clocks are enabled. A crash can be triggered by removing the driver in a kernel with CONFIG_DEBUG_SHIRQ enabled.
This patch frees the interrupts at each lima device finishing callback so that the handlers are already unregistered by the time we fully disable clocks.
--- drivers/gpu/drm/lima/lima_gp.c | 2 ++ drivers/gpu/drm/lima/lima_mmu.c | 5 +++++ drivers/gpu/drm/lima/lima_pp.c | 4 ++++ 3 files changed, 11 insertions(+)
drivers/gpu/drm/lima/lima_gp.c +2 -0
@@ -324,7 +324,9 @@ int lima_gp_init(struct lima_ip *ip)void lima_gp_fini (struct lima_ip *ip) { +struct lima_device *dev = ip->dev; +devm_free_irq (dev->dev, ip->irq, ip); }int lima_gp_pipe_init (struct lima_device *dev)
drivers/gpu/drm/lima/lima_mmu.c +5 -0
@@ -118,7 +118,12 @@ int lima_mmu_init(struct lima_ip *ip)void lima_mmu_fini (struct lima_ip *ip) { +struct lima_device *dev = ip->dev; + +if (ip->id == lima_ip_ppmmu_bcast) +return ; +devm_free_irq (dev->dev, ip->irq, ip); }void lima_mmu_flush_tlb (struct lima_ip *ip)
drivers/gpu/drm/lima/lima_pp.c +4 -0
@@ -266,7 +266,9 @@ int lima_pp_init(struct lima_ip *ip)void lima_pp_fini (struct lima_ip *ip) { +struct lima_device *dev = ip->dev; +devm_free_irq (dev->dev, ip->irq, ip); }int lima_pp_bcast_resume (struct lima_ip *ip)
@@ -299,7 +301,9 @@ int lima_pp_bcast_init(struct lima_ip *ip)void lima_pp_bcast_fini (struct lima_ip *ip) { +struct lima_device *dev = ip->dev; +devm_free_irq (dev->dev, ip->irq, ip); } static int lima_pp_task_validate(struct lima_sched_pipe *pipe,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 10/108 drm/amd/display: Skip finding free audio for unknown engine_id
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Hung <[email protected]>
[ Upstream commit 1357b2165d9ad94faa4c4a20d5e2ce29c2ff29c3 ]
[WHY]ENGINE_ID_UNKNOWN = -1 and can not be used as an array index. Plus, it also means it is uninitialized and does not need free audio.
[HOW]
Skip and return NULL.
This fixes 2 OVERRUN issues reported by Coverity.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -0
@@ -1802,6 +1802,9 @@ static struct audio *find_first_free_audio( {int i, available_audio_count; +if (id ==ENGINE_ID_UNKNOWN ) +return NULL ; + available_audio_count = pool->audio_count;for (i =0 ; i < available_audio_count; i++) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 11/108 media: dw2102: Dont translate i2c read into write
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bunk <[email protected]>
[ Upstream commit 0e148a522b8453115038193e19ec7bea71403e4a ]
The code ignored the I2C_M_RD flag on I2C messages. Instead it assumed an i2c transaction with a single message must be a write operation and a transaction with two messages would be a read operation.
Though this works for the driver code, it leads to problems once the i2c device is exposed to code not knowing this convention. For example, I did "insmod i2c-dev" and issued read requests from userspace, which were translated into write requests and destroyed the EEPROM of my device.
So, just check and respect the I2C_M_READ flag, which indicates a read when set on a message. If it is absent, it is a write message.
Incidentally, changing from the case statement to a while loop allows the code to lift the limitation to two i2c messages per transaction.
There are 4 more *_i2c_transfer functions affected by the same behaviour and limitation that should be fixed in the same way.
--- drivers/media/usb/dvb-usb/dw2102.c | 120 ++++++++++++++++++----------- 1 file changed, 73 insertions(+), 47 deletions(-)
drivers/media/usb/dvb-usb/dw2102.c +73 -47
@@ -716,6 +716,7 @@ static int su3000_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], {struct dvb_usb_device *d =i2c_get_adapdata (adap);struct dw2102_state *state; +int j;if (!d)return -ENODEV ;
@@ -729,11 +730,11 @@ static int su3000_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],return -EAGAIN ; } -switch (num) { -case 1 : -switch (msg[0 ].addr) { + j =0 ; +while (j < num) { +switch (msg[j].addr) {case SU3000_STREAM_CTRL : - state->data[0 ] = msg[0 ].buf[0 ] +0x36 ; + state->data[0 ] = msg[j].buf[0 ] +0x36 ; state->data[1 ] =3 ; state->data[2 ] =0 ; if (dvb_usb_generic_rw(d, state->data, 3,
@@ -745,61 +746,86 @@ static int su3000_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],if (dvb_usb_generic_rw (d, state->data,1 , state->data,2 ,0 ) <0 )err ("i2c transfer failed." ); - msg[0 ].buf[1 ] = state->data[0 ]; - msg[0 ].buf[0 ] = state->data[1 ]; + msg[j].buf[1 ] = state->data[0 ]; + msg[j].buf[0 ] = state->data[1 ];break ;default : -if (3 + msg[0 ].len >sizeof (state->data)) { -warn ("i2c wr: len=%d is too big!\n" , - msg[0 ].len); +/* if the current write msg is followed by a another +* read msg to/from the same address +*/ +if ((j+1 < num) && (msg[j+1 ].flags &I2C_M_RD ) && + (msg[j].addr == msg[j+1 ].addr)) { +/* join both i2c msgs to one usb read command */ +if (4 + msg[j].len >sizeof (state->data)) { +warn ("i2c combined wr/rd: write len=%d is too big!\n" , + msg[j].len); + num = -EOPNOTSUPP ; +break ; + } +if (1 + msg[j+1 ].len >sizeof (state->data)) { +warn ("i2c combined wr/rd: read len=%d is too big!\n" , + msg[j+1 ].len); + num = -EOPNOTSUPP ; +break ; + } + + state->data[0 ] =0x09 ; + state->data[1 ] = msg[j].len; + state->data[2 ] = msg[j+1 ].len; + state->data[3 ] = msg[j].addr; +memcpy (&state->data[4 ], msg[j].buf, msg[j].len); + +if (dvb_usb_generic_rw (d, state->data, msg[j].len +4 , + state->data, msg[j+1 ].len +1 ,0 ) <0 ) +err ("i2c transfer failed." ); + +memcpy (msg[j+1 ].buf, &state->data[1 ], msg[j+1 ].len); + j++; +break ; + } + +if (msg[j].flags &I2C_M_RD ) { +/* single read */ +if (1 + msg[j].len >sizeof (state->data)) { +warn ("i2c rd: len=%d is too big!\n" , msg[j].len); + num = -EOPNOTSUPP ; +break ; + } + + state->data[0 ] =0x09 ; + state->data[1 ] =0 ; + state->data[2 ] = msg[j].len; + state->data[3 ] = msg[j].addr; +memcpy (&state->data[4 ], msg[j].buf, msg[j].len); + +if (dvb_usb_generic_rw (d, state->data,4 , + state->data, msg[j].len +1 ,0 ) <0 ) +err ("i2c transfer failed." ); + +memcpy (msg[j].buf, &state->data[1 ], msg[j].len); +break ; + } + +/* single write */ +if (3 + msg[j].len >sizeof (state->data)) { +warn ("i2c wr: len=%d is too big!\n" , msg[j].len); num = -EOPNOTSUPP ;break ; } -/* always i2c write*/ state->data[0 ] =0x08 ; - state->data[1 ] = msg[0 ].addr; - state->data[2 ] = msg[0 ].len; + state->data[1 ] = msg[j].addr; + state->data[2 ] = msg[j].len; -memcpy (&state->data[3 ], msg[0 ].buf, msg[0 ].len); +memcpy (&state->data[3 ], msg[j].buf, msg[j].len); -if (dvb_usb_generic_rw (d, state->data, msg[0 ].len +3 , +if (dvb_usb_generic_rw (d, state->data, msg[j].len +3 , state->data,1 ,0 ) <0 )err ("i2c transfer failed." ); + }// switch + j++; - } -break ; -case 2 : -/* always i2c read */ -if (4 + msg[0 ].len >sizeof (state->data)) { -warn ("i2c rd: len=%d is too big!\n" , - msg[0 ].len); - num = -EOPNOTSUPP ; -break ; - } -if (1 + msg[1 ].len >sizeof (state->data)) { -warn ("i2c rd: len=%d is too big!\n" , - msg[1 ].len); - num = -EOPNOTSUPP ; -break ; - } - - state->data[0 ] =0x09 ; - state->data[1 ] = msg[0 ].len; - state->data[2 ] = msg[1 ].len; - state->data[3 ] = msg[0 ].addr; -memcpy (&state->data[4 ], msg[0 ].buf, msg[0 ].len); - -if (dvb_usb_generic_rw (d, state->data, msg[0 ].len +4 , - state->data, msg[1 ].len +1 ,0 ) <0 ) -err ("i2c transfer failed." ); - -memcpy (msg[1 ].buf, &state->data[1 ], msg[1 ].len); -break ; -default : -warn ("more than 2 i2c messages at a time is not handled yet." ); -break ; - } + }// while mutex_unlock (&d->data_mutex);mutex_unlock (&d->i2c_mutex);return num;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 12/108 sctp: prefer struct_size over open coded arithmetic
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Erick Archer <[email protected]>
[ Upstream commit e5c5f3596de224422561d48eba6ece5210d967b3 ]
This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1][2].
As the "ids" variable is a pointer to "struct sctp_assoc_ids" and this structure ends in a flexible array:
struct sctp_assoc_ids {
[...]
sctp_assoc_t gaids_assoc_id[];
};the preferred way in the kernel is to use the struct_size() helper to do the arithmetic instead of the calculation "size + size * count" in the kmalloc() function.
Also, refactor the code adding the "ids_size" variable to avoid sizing twice.
This way, the code is more readable and safer.
This code was detected with the help of Coccinelle, and audited and modified manually.
--- net/sctp/socket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/sctp/socket.c +4 -3
@@ -6994,6 +6994,7 @@ static int sctp_getsockopt_assoc_ids(struct sock *sk, int len,struct sctp_sock *sp =sctp_sk (sk);struct sctp_association *asoc;struct sctp_assoc_ids *ids; +size_t ids_size;u32 num =0 ;if (sctp_style (sk,TCP ))
@@ -7006,11 +7007,11 @@ static int sctp_getsockopt_assoc_ids(struct sock *sk, int len, num++; } -if (len <sizeof (struct sctp_assoc_ids ) +sizeof (sctp_assoc_t) * num) + ids_size =struct_size (ids, gaids_assoc_id, num); +if (len < ids_size)return -EINVAL ; - len =sizeof (struct sctp_assoc_ids ) +sizeof (sctp_assoc_t) * num; - + len = ids_size; ids =kmalloc (len,GFP_USER | __GFP_NOWARN);if (unlikely (!ids))return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 13/108 firmware: dmi: Stop decoding on broken entry
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean Delvare <[email protected]>
[ Upstream commit 0ef11f604503b1862a21597436283f158114d77e ]
If a DMI table entry is shorter than 4 bytes, it is invalid. Due to how DMI table parsing works, it is impossible to safely recover from such an error, so we have to stop decoding the table.
--- drivers/firmware/dmi_scan.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/firmware/dmi_scan.c +11 -0
@@ -101,6 +101,17 @@ static void dmi_decode_table(u8 *buf, (data - buf + sizeof(struct dmi_header)) <= dmi_len) {const struct dmi_header *dm = (const struct dmi_header *)data; +/* +* If a short entry is found (less than 4 bytes), not only it +* is invalid, but we cannot reliably locate the next entry. +*/ +if (dm->length <sizeof (struct dmi_header )) { +pr_warn (FW_BUG +"Corrupted DMI table, offset %zd (only %d entries processed)\n" , + data - buf, i); +break ; + } +/* * We want to know the total length (formatted area and * strings) before decoding to make sure we won't run off the
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 14/108 Input: ff-core - prefer struct_size over open coded arithmetic
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Erick Archer <[email protected]>
[ Upstream commit a08b8f8557ad88ffdff8905e5da972afe52e3307 ]
This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1][2].
As the "ff" variable is a pointer to "struct ff_device" and this structure ends in a flexible array:
struct ff_device {
[...]
struct file *effect_owners[] __counted_by(max_effects);
};the preferred way in the kernel is to use the struct_size() helper to do the arithmetic instead of the calculation "size + count * size" in the kzalloc() function.
The struct_size() helper returns SIZE_MAX on overflow. So, refactor the comparison to take advantage of this.
This way, the code is more readable and safer.
This code was detected with the help of Coccinelle, and audited and modified manually.
--- drivers/input/ff-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/input/ff-core.c +4 -3
@@ -12,8 +12,10 @@/* #define DEBUG */ #include <linux/input.h> +#include <linux/limits.h> #include <linux/module.h> #include <linux/mutex.h> +#include <linux/overflow.h> #include <linux/sched.h> #include <linux/slab.h>
@@ -318,9 +320,8 @@ int input_ff_create(struct input_dev *dev, unsigned int max_effects)return -EINVAL ; } - ff_dev_size =sizeof (struct ff_device ) + - max_effects *sizeof (struct file *); -if (ff_dev_size < max_effects)/* overflow */ + ff_dev_size =struct_size (ff, effect_owners, max_effects); +if (ff_dev_size ==SIZE_MAX )/* overflow */ return -EINVAL ; ff =kzalloc (ff_dev_size,GFP_KERNEL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 15/108 net: dsa: mv88e6xxx: Correct check for empty list
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Horman <[email protected]>
[ Upstream commit 4c7f3950a9fd53a62b156c0fe7c3a2c43b0ba19b ]
Since commit a3c53be55c95 ("net: dsa: mv88e6xxx: Support multiple MDIO busses") mv88e6xxx_default_mdio_bus() has checked that the return value of list_first_entry() is non-NULL.
This appears to be intended to guard against the list chip->mdios being empty. However, it is not the correct check as the implementation of list_first_entry is not designed to return NULL for empty lists.
Instead, use list_first_entry_or_null() which does return NULL if the list is empty.
Flagged by Smatch.
Compile tested only.
--- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +2 -2
@@ -116,8 +116,8 @@ struct mii_bus *mv88e6xxx_default_mdio_bus(struct mv88e6xxx_chip *chip) {struct mv88e6xxx_mdio_bus *mdio_bus; - mdio_bus = list_first_entry(&chip->mdios, struct mv88e6xxx_mdio_bus, - list); + mdio_bus =list_first_entry_or_null (&chip->mdios, + struct mv88e6xxx_mdio_bus, list);if (!mdio_bus)return NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 16/108 media: dvb-frontends: tda18271c2dd: Remove casting during div
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit e9a844632630e18ed0671a7e3467431bd719952e ]
do_div() divides 64 bits by 32. We were adding a casting to the divider to 64 bits, for a number that fits perfectly in 32 bits. Remove it.
Found by cocci:
drivers/media/dvb-frontends/tda18271c2dd.c:355:1-7: WARNING: do_div() does a 64-by-32 division, please consider using div64_u64 instead. drivers/media/dvb-frontends/tda18271c2dd.c:331:1-7: WARNING: do_div() does a 64-by-32 division, please consider using div64_u64 instead.
--- drivers/media/dvb-frontends/tda18271c2dd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/dvb-frontends/tda18271c2dd.c +2 -2
@@ -328,7 +328,7 @@ static int CalcMainPLL(struct tda_state *state, u32 freq) OscFreq = (u64 ) freq * (u64 ) Div; OscFreq *= (u64 )16384 ; -do_div (OscFreq, (u64 )16000000 ); +do_div (OscFreq,16000000 ); MainDiv = OscFreq; state->m_Regs[MPD ] = PostDiv &0x77 ;
@@ -352,7 +352,7 @@ static int CalcCalPLL(struct tda_state *state, u32 freq) OscFreq = (u64 )freq * (u64 )Div;/* CalDiv = u32( OscFreq * 16384 / 16000000 ); */ OscFreq *= (u64 )16384 ; -do_div (OscFreq, (u64 )16000000 ); +do_div (OscFreq,16000000 ); CalDiv = OscFreq; state->m_Regs[CPD ] = PostDiv;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 17/108 media: s2255: Use refcount_t instead of atomic_t for num_channels
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 6cff72f6bcee89228a662435b7c47e21a391c8d0 ]
Use an API that resembles more the actual use of num_channels.
Found by cocci:
drivers/media/usb/s2255/s2255drv.c:2362:5-24: WARNING: atomic_dec_and_test variation before object free at line 2363. drivers/media/usb/s2255/s2255drv.c:1557:5-24: WARNING: atomic_dec_and_test variation before object free at line 1558.
--- drivers/media/usb/s2255/s2255drv.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/media/usb/s2255/s2255drv.c +10 -10
@@ -247,7 +247,7 @@ struct s2255_vc {struct s2255_dev {struct s2255_vc vc[MAX_CHANNELS ];struct v4l2_device v4l2_dev; -atomic_t num_channels; +refcount_t num_channels;int frames;struct mutex lock;/* channels[].vdev.lock */ struct mutex cmdlock;/* protects cmdbuf */
@@ -1552,11 +1552,11 @@ static void s2255_video_device_release(struct video_device *vdev) container_of(vdev, struct s2255_vc, vdev);dprintk (dev,4 ,"%s, chnls: %d\n" , __func__, -atomic_read (&dev->num_channels)); +refcount_read (&dev->num_channels));v4l2_ctrl_handler_free (&vc->hdl); -if (atomic_dec_and_test (&dev->num_channels)) +if (refcount_dec_and_test (&dev->num_channels))s2255_destroy (dev);return ; }
@@ -1661,7 +1661,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev) "failed to register video device!\n");break ; } -atomic_inc (&dev->num_channels); +refcount_inc (&dev->num_channels);v4l2_info (&dev->v4l2_dev,"V4L2 device registered as %s\n" ,video_device_node_name (&vc->vdev));
@@ -1669,11 +1669,11 @@ static int s2255_probe_v4l(struct s2255_dev *dev)pr_info ("Sensoray 2255 V4L driver Revision: %s\n" ,S2255_VERSION );/* if no channels registered, return error and probe will fail*/ -if (atomic_read (&dev->num_channels) ==0 ) { +if (refcount_read (&dev->num_channels) ==0 ) {v4l2_device_unregister (&dev->v4l2_dev);return ret; } -if (atomic_read (&dev->num_channels) !=MAX_CHANNELS ) +if (refcount_read (&dev->num_channels) !=MAX_CHANNELS )pr_warn ("s2255: Not all channels available.\n" );return 0 ; }
@@ -2222,7 +2222,7 @@ static int s2255_probe(struct usb_interface *interface, goto errorFWDATA1; } -atomic_set (&dev->num_channels,0 ); +refcount_set (&dev->num_channels,0 ); dev->pid = id->idProduct; dev->fw_data =kzalloc (sizeof (struct s2255_fw ),GFP_KERNEL );if (!dev->fw_data)
@@ -2342,12 +2342,12 @@ static void s2255_disconnect(struct usb_interface *interface) {struct s2255_dev *dev =to_s2255_dev (usb_get_intfdata (interface));int i; -int channels =atomic_read (&dev->num_channels); +int channels =refcount_read (&dev->num_channels);mutex_lock (&dev->lock);v4l2_device_disconnect (&dev->v4l2_dev);mutex_unlock (&dev->lock);/*see comments in the uvc_driver.c usb disconnect function */ -atomic_inc (&dev->num_channels); +refcount_inc (&dev->num_channels);/* unregister each video device. */ for (i =0 ; i < channels; i++)video_unregister_device (&dev->vc[i].vdev);
@@ -2360,7 +2360,7 @@ static void s2255_disconnect(struct usb_interface *interface) dev->vc[i].vidstatus_ready =1 ;wake_up (&dev->vc[i].wait_vidstatus); } -if (atomic_dec_and_test (&dev->num_channels)) +if (refcount_dec_and_test (&dev->num_channels))s2255_destroy (dev);dev_info (&interface->dev,"%s\n" , __func__); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 18/108 media: dvb-frontends: tda10048: Fix integer overflow
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 1aa1329a67cc214c3b7bd2a14d1301a795760b07 ]
state->xtal_hz can be up to 16M, so it can overflow a 32 bit integer when multiplied by pll_mfactor.
Create a new 64 bit variable to hold the calculations.
--- drivers/media/dvb-frontends/tda10048.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/dvb-frontends/tda10048.c +6 -3
@@ -410,6 +410,7 @@ static int tda10048_set_if(struct dvb_frontend *fe, u32 bw)struct tda10048_config *config = &state->config;int i;u32 if_freq_khz; +u64 sample_freq;dprintk (1 ,"%s(bw = %d)\n" , __func__, bw);
@@ -451,9 +452,11 @@ static int tda10048_set_if(struct dvb_frontend *fe, u32 bw)dprintk (1 ,"- pll_pfactor = %d\n" , state->pll_pfactor);/* Calculate the sample frequency */ - state->sample_freq = state->xtal_hz * (state->pll_mfactor +45 ); - state->sample_freq /= (state->pll_nfactor +1 ); - state->sample_freq /= (state->pll_pfactor +4 ); + sample_freq = state->xtal_hz; + sample_freq *= state->pll_mfactor +45 ; +do_div (sample_freq, state->pll_nfactor +1 ); +do_div (sample_freq, state->pll_pfactor +4 ); + state->sample_freq = sample_freq;dprintk (1 ,"- sample_freq = %d\n" , state->sample_freq);/* Update the I/F */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 19/108 i2c: i801: Annotate apanel_addr as __ro_after_init
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit 355b1513b1e97b6cef84b786c6480325dfd3753d ]
Annotate this variable as __ro_after_init to protect it from being overwritten later.
--- drivers/i2c/busses/i2c-i801.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-i801.c +1 -1
@@ -1078,7 +1078,7 @@ static const struct pci_device_id i801_ids[] = {MODULE_DEVICE_TABLE (pci, i801_ids);#if definedCONFIG_X86 && definedCONFIG_DMI -static unsigned char apanel_addr; +static unsigned char apanel_addr__ro_after_init ;/* Scan the system ROM for the signature "FJKEYINF" */ static __init const void __iomem *bios_signature (const void __iomem *bios)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 2/108 media: dvb: as102-fe: Fix as10x_register_addr packing
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 309422d280748c74f57f471559980268ac27732a ]
This structure is embedded in multiple other structures that are packed, which conflicts with it being aligned.
drivers/media/usb/as102/as10x_cmd.h:379:30: warning: field reg_addr within 'struct as10x_dump_memory::(unnamed at drivers/media/usb/as102/as10x_cmd.h:373:2)' is less aligned than 'struct as10x_register_addr' and is usually due to 'struct as10x_dump_memory::(unnamed at drivers/media/usb/as102/as10x_cmd.h:373:2)' being packed, which can lead to unaligned accesses [-Wunaligned-access]
Mark it as being packed.
Marking the inner struct as 'packed' does not change the layout, since the whole struct is already packed, it just silences the clang warning. See also this llvm discussion:
https://github.com/llvm/llvm-project/issues/55520
--- drivers/media/dvb-frontends/as102_fe_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb-frontends/as102_fe_types.h +1 -1
@@ -174,6 +174,6 @@ struct as10x_register_addr {uint32_t addr;/* register mode access */ uint8_t mode; -}; +} __packed;#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 20/108 powerpc/64: Set _IO_BASE to POISON_POINTER_DELTA not 0 for CONFIG_PCI=n
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit be140f1732b523947425aaafbe2e37b41b622d96 ]
There is code that builds with calls to IO accessors even when CONFIG_PCI=n, but the actual calls are guarded by runtime checks.
If not those calls would be faulting, because the page at virtual address zero is (usually) not mapped into the kernel. As Arnd pointed out, it is possible a large port value could cause the address to be above mmap_min_addr which would then access userspace, which would be a bug.
To avoid any such issues, set _IO_BASE to POISON_POINTER_DELTA. That is a value chosen to point into unmapped space between the kernel and userspace, so any access will always fault.
Note that on 32-bit POISON_POINTER_DELTA is 0, so the patch only has an effect on 64-bit.
--- arch/powerpc/include/asm/io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/io.h +1 -1
@@ -45,7 +45,7 @@ extern struct pci_dev *isa_bridge_pcidev;* define properly based on the platform */ #ifndef CONFIG_PCI -#define _IO_BASE 0 +#define _IO_BASE POISON_POINTER_DELTA#define _ISA_MEM_BASE 0#define PCI_DRAM_OFFSET 0#elif defined(CONFIG_PPC32 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 21/108 orangefs: fix out-of-bounds fsid access
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Marshall <[email protected]>
[ Upstream commit 53e4efa470d5fc6a96662d2d3322cfc925818517 ]
Arnd Bergmann sent a patch to fsdevel, he says:
"orangefs_statfs() copies two consecutive fields of the superblock into the statfs structure, which triggers a warning from the string fortification helpers"
Jan Kara suggested an alternate way to do the patch to make it more readable.
I ran both ideas through xfstests and both seem fine. This patch is based on Jan Kara's suggestion.
--- fs/orangefs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/orangefs/super.c +2 -1
@@ -200,7 +200,8 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) (long)new_op->downcall.resp.statfs.files_avail); buf->f_type = sb->s_magic; -memcpy (&buf->f_fsid, &ORANGEFS_SB (sb)->fs_id,sizeof (buf->f_fsid)); + buf->f_fsid.val[0 ] =ORANGEFS_SB (sb)->fs_id; + buf->f_fsid.val[1 ] =ORANGEFS_SB (sb)->id; buf->f_bsize = new_op->downcall.resp.statfs.block_size; buf->f_namelen =ORANGEFS_NAME_MAX ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 22/108 kunit: Fix timeout message
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mickaël Salaün <[email protected]>
[ Upstream commit 53026ff63bb07c04a0e962a74723eb10ff6f9dc7 ]
The exit code is always checked, so let's properly handle the -ETIMEDOUT error code.
--- lib/kunit/try-catch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/kunit/try-catch.c +2 -1
@@ -76,7 +76,6 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) time_remaining =wait_for_completion_timeout (&try_completion,kunit_test_timeout ());if (time_remaining ==0 ) { -kunit_err (test,"try timed out\n" ); try_catch->try_result = -ETIMEDOUT ; }
@@ -89,6 +88,8 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) try_catch->try_result =0 ; else if (exit_code == -EINTR) kunit_err(test, "wake_up_process() was never called\n"); + else if (exit_code == -ETIMEDOUT) + kunit_err(test, "try timed out\n"); else if (exit_code) kunit_err(test, "Unknown error: %d\n", exit_code);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 23/108 powerpc/xmon: Check cpu id in commands "c#", "dp#" and "dx#"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kurz <[email protected]>
[ Upstream commit 8873aab8646194a4446117bb617cc71bddda2dee ]
All these commands end up peeking into the PACA using the user originated cpu id as an index. Check the cpu id is valid in order to prevent xmon to crash. Instead of printing an error, this follows the same behavior as the "lp s #" command : ignore the buggy cpu id parameter and fall back to the #-less version of the command.
--- arch/powerpc/xmon/xmon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/xmon/xmon.c +3 -3
@@ -1249,7 +1249,7 @@ static int cpu_cmd(void)unsigned long cpu, first_cpu, last_cpu;int timeout; -if (!scanhex (&cpu)) { +if (!scanhex (&cpu) || cpu >=num_possible_cpus ()) {/* print cpus waiting or in xmon */ printf ("cpus stopped:" ); last_cpu = first_cpu =NR_CPUS ;
@@ -2680,7 +2680,7 @@ static void dump_pacas(void) termch = c;/* Put c back, it wasn't 'a' */ -if (scanhex (&num)) +if (scanhex (&num) && num <num_possible_cpus ())dump_one_paca (num);else dump_one_paca (xmon_owner);
@@ -2777,7 +2777,7 @@ static void dump_xives(void) termch = c;/* Put c back, it wasn't 'a' */ -if (scanhex (&num)) +if (scanhex (&num) && num <num_possible_cpus ())dump_one_xive (num);else dump_one_xive (xmon_owner);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 24/108 bpf: Avoid uninitialized value in BPF_CORE_READ_BITFIELD
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jose E. Marchesi <[email protected]>
[ Upstream commit 009367099eb61a4fc2af44d4eb06b6b4de7de6db ]
[Changes from V1:
- Use a default branch in the switch statement to initialize `val'.]
GCC warns that `val' may be used uninitialized in the BPF_CRE_READ_BITFIELD macro, defined in bpf_core_read.h as:
[...]
unsigned long long val; \
[...] \
switch (__CORE_RELO(s, field, BYTE_SIZE)) { \
case 1: val = *(const unsigned char *)p; break; \
case 2: val = *(const unsigned short *)p; break; \
case 4: val = *(const unsigned int *)p; break; \
case 8: val = *(const unsigned long long *)p; break; \
} \
[...]
val; \
} \This patch adds a default entry in the switch statement that sets `val' to zero in order to avoid the warning, and random values to be used in case __builtin_preserve_field_info returns unexpected values for BPF_FIELD_BYTE_SIZE.
Tested in bpf-next master.
No regressions.
--- tools/lib/bpf/bpf_core_read.h | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/bpf_core_read.h +1 -0
@@ -101,6 +101,7 @@ enum bpf_enum_value_kind {case 2 : val = *(const unsigned short *)p;break ; \case 4 : val = *(const unsigned int *)p;break ; \case 8 : val = *(const unsigned long long *)p;break ; \ +default : val =0 ;break ; \ } \ val <<=__CORE_RELO (s, field,LSHIFT_U64 ); \if (__CORE_RELO (s, field,SIGNED )) \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 25/108 jffs2: Fix potential illegal address access in jffs2_free_inode
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Yong <[email protected]>
[ Upstream commit af9a8730ddb6a4b2edd779ccc0aceb994d616830 ]
During the stress testing of the jffs2 file system,the following abnormal printouts were found:
[ 2430.649000] Unable to handle kernel paging request at virtual address 0069696969696948 [ 2430.649622] Mem abort info: [ 2430.649829] ESR = 0x96000004 [ 2430.650115] EC = 0x25: DABT (current EL), IL = 32 bits [ 2430.650564] SET = 0, FnV = 0 [ 2430.650795] EA = 0, S1PTW = 0 [ 2430.651032] FSC = 0x04: level 0 translation fault [ 2430.651446] Data abort info: [ 2430.651683] ISV = 0, ISS = 0x00000004 [ 2430.652001] CM = 0, WnR = 0 [ 2430.652558] [0069696969696948] address between user and kernel address ranges [ 2430.653265] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 2430.654512] CPU: 2 PID: 20919 Comm: cat Not tainted 5.15.25-g512f31242bf6 #33 [ 2430.655008] Hardware name: linux,dummy-virt (DT) [ 2430.655517] pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 2430.656142] pc : kfree+0x78/0x348 [ 2430.656630] lr : jffs2_free_inode+0x24/0x48 [ 2430.657051] sp : ffff800009eebd10 [ 2430.657355] x29: ffff800009eebd10 x28: 0000000000000001 x27: 0000000000000000 [ 2430.658327] x26: ffff000038f09d80 x25: 0080000000000000 x24: ffff800009d38000 [ 2430.658919] x23: 5a5a5a5a5a5a5a5a x22: ffff000038f09d80 x21: ffff8000084f0d14 [ 2430.659434] x20: ffff0000bf9a6ac0 x19: 0169696969696940 x18: 0000000000000000 [ 2430.659969] x17: ffff8000b6506000 x16: ffff800009eec000 x15: 0000000000004000 [ 2430.660637] x14: 0000000000000000 x13: 00000001000820a1 x12: 00000000000d1b19 [ 2430.661345] x11: 0004000800000000 x10: 0000000000000001 x9 : ffff8000084f0d14 [ 2430.662025] x8 : ffff0000bf9a6b40 x7 : ffff0000bf9a6b48 x6 : 0000000003470302 [ 2430.662695] x5 : ffff00002e41dcc0 x4 : ffff0000bf9aa3b0 x3 : 0000000003470342 [ 2430.663486] x2 : 0000000000000000 x1 : ffff8000084f0d14 x0 : fffffc0000000000 [ 2430.664217] Call trace: [ 2430.664528] kfree+0x78/0x348 [ 2430.664855] jffs2_free_inode+0x24/0x48 [ 2430.665233] i_callback+0x24/0x50 [ 2430.665528] rcu_do_batch+0x1ac/0x448 [ 2430.665892] rcu_core+0x28c/0x3c8 [ 2430.666151] rcu_core_si+0x18/0x28 [ 2430.666473] __do_softirq+0x138/0x3cc [ 2430.666781] irq_exit+0xf0/0x110 [ 2430.667065] handle_domain_irq+0x6c/0x98 [ 2430.667447] gic_handle_irq+0xac/0xe8 [ 2430.667739] call_on_irq_stack+0x28/0x54
The parameter passed to kfree was 5a5a5a5a, which corresponds to the target field of the jffs_inode_info structure. It was found that all variables in the jffs_inode_info structure were 5a5a5a5a, except for the first member sem. It is suspected that these variables are not initialized because they were set to 5a5a5a5a during memory testing, which is meant to detect uninitialized memory.The sem variable is initialized in the function jffs2_i_init_once, while other members are initialized in
the function jffs2_init_inode_info.
The function jffs2_init_inode_info is called after iget_locked, but in the iget_locked function, the destroy_inode process is triggered, which releases the inode and consequently, the target member of the inode is not initialized.In concurrent high pressure scenarios, iget_locked may enter the destroy_inode branch as described in the code.
Since the destroy_inode functionality of jffs2 only releases the target, the fix method is to set target to NULL in jffs2_i_init_once.
--- fs/jffs2/super.c | 1 + 1 file changed, 1 insertion(+)
fs/jffs2/super.c +1 -0
@@ -58,6 +58,7 @@ static void jffs2_i_init_once(void *foo)struct jffs2_inode_info *f = foo;mutex_init (&f->sem); + f->target =NULL ;inode_init_once (&f->vfs_inode); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 26/108 s390/pkey: Wipe sensitive data on failure
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Holger Dengler <[email protected]>
[ Upstream commit 1d8c270de5eb74245d72325d285894a577a945d9 ]
Wipe sensitive data from stack also if the copy_to_user() fails.
--- drivers/s390/crypto/pkey_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/crypto/pkey_api.c +2 -2
@@ -1155,7 +1155,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd,if (rc)break ;if (copy_to_user (ucs, &kcs,sizeof (kcs))) -return -EFAULT ; + rc = -EFAULT ;memzero_explicit (&kcs,sizeof (kcs));break ; }
@@ -1187,7 +1187,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd,if (rc)break ;if (copy_to_user (ucp, &kcp,sizeof (kcp))) -return -EFAULT ; + rc = -EFAULT ;memzero_explicit (&kcp,sizeof (kcp));break ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 27/108 UPSTREAM: tcp: fix DSACK undo in fast recovery to call tcp_try_to_open()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neal Cardwell <[email protected]>
[ Upstream commit a6458ab7fd4f427d4f6f54380453ad255b7fde83 ]
In some production workloads we noticed that connections could sometimes close extremely prematurely with ETIMEDOUT after transmitting only 1 TLP and RTO retransmission (when we would normally expect roughly tcp_retries2 = TCP_RETR2 = 15 RTOs before a connection closes with ETIMEDOUT).
Quoted 1 line
From tracing we determined that these workloads can suffer from a
scenario where in fast recovery, after some retransmits, a DSACK undo can happen at a point where the scoreboard is totally clear (we have retrans_out == sacked_out == lost_out == 0). In such cases, calling tcp_try_keep_open() means that we do not execute any code path that clears tp->retrans_stamp to 0. That means that tp->retrans_stamp can remain erroneously set to the start time of the undone fast recovery, even after the fast recovery is undone. If minutes or hours elapse, and then a TLP/RTO/RTO sequence occurs, then the start_ts value in retransmits_timed_out() (which is from tp->retrans_stamp) will be erroneously ancient (left over from the fast recovery undone via DSACKs). Thus this ancient tp->retrans_stamp value can cause the connection to die very prematurely with ETIMEDOUT via tcp_write_err().
The fix: we change DSACK undo in fast recovery (TCP_CA_Recovery) to call tcp_try_to_open() instead of tcp_try_keep_open(). This ensures that if no retransmits are in flight at the time of DSACK undo in fast recovery then we properly zero retrans_stamp. Note that calling tcp_try_to_open() is more consistent with other loss recovery behavior, since normal fast recovery (CA_Recovery) and RTO recovery (CA_Loss) both normally end when tp->snd_una meets or exceeds tp->high_seq and then in tcp_fastretrans_alert() the "default" switch case executes tcp_try_to_open(). Also note that by inspection this change to call tcp_try_to_open() implies at least one other nice bug fix, where now an ECE-marked DSACK that causes an undo will properly invoke tcp_enter_cwr() rather than ignoring the ECE mark.
--- net/ipv4/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_input.c +1 -1
@@ -2993,7 +2993,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,return ;if (tcp_try_undo_dsack (sk)) -tcp_try_keep_open (sk); +tcp_try_to_open (sk, flag);tcp_identify_packet_loss (sk, ack_flag);if (icsk->icsk_ca_state != TCP_CA_Recovery) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/108 tcp_metrics: validate source addr length
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 66be40e622e177316ae81717aa30057ba9e61dff ]
I don't see anything checking that TCP_METRICS_ATTR_SADDR_IPV4 is at least 4 bytes long, and the policy doesn't have an entry for this attribute at all (neither does it for IPv6 but v6 is manually validated).
--- net/ipv4/tcp_metrics.c | 1 + 1 file changed, 1 insertion(+)
net/ipv4/tcp_metrics.c +1 -0
@@ -619,6 +619,7 @@ static const struct nla_policy tcp_metrics_nl_policy[TCP_METRICS_ATTR_MAX + 1] = [TCP_METRICS_ATTR_ADDR_IPV4] = { .type = NLA_U32, }, [TCP_METRICS_ATTR_ADDR_IPV6] = { .type = NLA_BINARY, .len = sizeof(struct in6_addr), }, + [TCP_METRICS_ATTR_SADDR_IPV4] = { .type = NLA_U32, },/* Following attributes are not received for GET/DEL, * we keep them for reference */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 3/108 media: dvb-usb: dib0700_devices: Add missing release_firmware()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 4b267c23ee064bd24c6933df0588ad1b6e111145 ]
Add missing release_firmware on the error paths.
drivers/media/usb/dvb-usb/dib0700_devices.c:2415 stk9090m_frontend_attach() warn: 'state->frontend_firmware' from request_firmware() not released on lines: 2415. drivers/media/usb/dvb-usb/dib0700_devices.c:2497 nim9090md_frontend_attach() warn: 'state->frontend_firmware' from request_firmware() not released on lines: 2489,2497.
--- drivers/media/usb/dvb-usb/dib0700_devices.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/media/usb/dvb-usb/dib0700_devices.c +15 -3
@@ -2419,7 +2419,12 @@ static int stk9090m_frontend_attach(struct dvb_usb_adapter *adap) adap->fe_adap[0 ].fe =dvb_attach (dib9000_attach, &adap->dev->i2c_adap,0x80 , &stk9090m_config); -return adap->fe_adap[0 ].fe ==NULL ? -ENODEV :0 ; +if (!adap->fe_adap[0 ].fe) { +release_firmware (state->frontend_firmware); +return -ENODEV ; + } + +return 0 ; }static int dib9090_tuner_attach (struct dvb_usb_adapter *adap)
@@ -2492,8 +2497,10 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap)dib9000_i2c_enumeration (&adap->dev->i2c_adap,1 ,0x20 ,0x80 ); adap->fe_adap[0 ].fe =dvb_attach (dib9000_attach, &adap->dev->i2c_adap,0x80 , &nim9090md_config[0 ]); -if (adap->fe_adap[0 ].fe ==NULL ) +if (!adap->fe_adap[0 ].fe) { +release_firmware (state->frontend_firmware);return -ENODEV ; + } i2c =dib9000_get_i2c_master (adap->fe_adap[0 ].fe,DIBX000_I2C_INTERFACE_GPIO_3_4 ,0 );dib9000_i2c_enumeration (i2c,1 ,0x12 ,0x82 );
@@ -2501,7 +2508,12 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap) fe_slave =dvb_attach (dib9000_attach, i2c,0x82 , &nim9090md_config[1 ]);dib9000_set_slave_frontend (adap->fe_adap[0 ].fe, fe_slave); -return fe_slave ==NULL ? -ENODEV :0 ; +if (!fe_slave) { +release_firmware (state->frontend_firmware); +return -ENODEV ; + } + +return 0 ; }static int nim9090md_tuner_attach (struct dvb_usb_adapter *adap)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 4/108 IB/core: Implement a limit on UMAD receive List
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Guralnik <[email protected]>
[ Upstream commit ca0b44e20a6f3032224599f02e7c8fb49525c894 ]
The existing behavior of ib_umad, which maintains received MAD packets in an unbounded list, poses a risk of uncontrolled growth. As user-space applications extract packets from this list, the rate of extraction may not match the rate of incoming packets, leading to potential list overflow.
To address this, we introduce a limit to the size of the list. After considering typical scenarios, such as OpenSM processing, which can handle approximately 100k packets per second, and the 1-second retry timeout for most packets, we set the list size limit to 200k. Packets received beyond this limit are dropped, assuming they are likely timed out by the time they are handled by user-space.
Notably, packets queued on the receive list due to reasons like timed-out sends are preserved even when the list is full.
--- drivers/infiniband/core/user_mad.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/infiniband/core/user_mad.c +15 -6
@@ -63,6 +63,8 @@ MODULE_AUTHOR("Roland Dreier");MODULE_DESCRIPTION ("InfiniBand userspace MAD packet access" );MODULE_LICENSE ("Dual BSD/GPL" ); +#define MAX_UMAD_RECV_LIST_SIZE 200000 +enum {IB_UMAD_MAX_PORTS =RDMA_MAX_PORTS ,IB_UMAD_MAX_AGENTS =32 ,
@@ -113,6 +115,7 @@ struct ib_umad_file {struct mutex mutex;struct ib_umad_port *port;struct list_head recv_list; +atomic_t recv_list_size;struct list_head send_list;struct list_head port_list;spinlock_t send_lock;
@@ -180,24 +183,28 @@ static struct ib_mad_agent *__get_agent(struct ib_umad_file *file, int id)return file->agents_dead ?NULL : file->agent[id]; } -static int queue_packet (struct ib_umad_file *file, -struct ib_mad_agent *agent, -struct ib_umad_packet *packet) +static int queue_packet (struct ib_umad_file *file,struct ib_mad_agent *agent, +struct ib_umad_packet *packet,bool is_recv_mad) {int ret =1 ;mutex_lock (&file->mutex); +if (is_recv_mad && +atomic_read (&file->recv_list_size) >MAX_UMAD_RECV_LIST_SIZE ) + goto unlock; +for (packet->mad.hdr.id =0 ; packet->mad.hdr.id <IB_UMAD_MAX_AGENTS ; packet->mad.hdr.id++)if (agent ==__get_agent (file, packet->mad.hdr.id)) {list_add_tail (&packet->list, &file->recv_list); +atomic_inc (&file->recv_list_size);wake_up_interruptible (&file->recv_wait); ret =0 ;break ; } - +unlock:mutex_unlock (&file->mutex);return ret;
@@ -224,7 +231,7 @@ static void send_handler(struct ib_mad_agent *agent,if (send_wc->status ==IB_WC_RESP_TIMEOUT_ERR ) { packet->length =IB_MGMT_MAD_HDR ; packet->mad.hdr.status =ETIMEDOUT ; -if (!queue_packet (file, agent, packet)) +if (!queue_packet (file, agent, packet, false))return ; }kfree (packet);
@@ -284,7 +291,7 @@ static void recv_handler(struct ib_mad_agent *agent,rdma_destroy_ah_attr (&ah_attr); } -if (queue_packet (file, agent, packet)) +if (queue_packet (file, agent, packet, true)) goto err2;return ;
@@ -409,6 +416,7 @@ static ssize_t ib_umad_read(struct file *filp, char __user *buf, packet = list_entry(file->recv_list.next, struct ib_umad_packet, list);list_del (&packet->list); +atomic_dec (&file->recv_list_size);mutex_unlock (&file->mutex);
@@ -421,6 +429,7 @@ static ssize_t ib_umad_read(struct file *filp, char __user *buf,/* Requeue packet */ mutex_lock (&file->mutex);list_add (&packet->list, &file->recv_list); +atomic_inc (&file->recv_list_size);mutex_unlock (&file->mutex); }else {if (packet->recv_wc)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 5/108 scsi: qedf: Make qedf_execute_tmf() non-preemptible
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Meneghini <[email protected]>
[ Upstream commit 0d8b637c9c5eeaa1a4e3dfb336f3ff918eb64fec ]
Stop calling smp_processor_id() from preemptible code in qedf_execute_tmf90. This results in BUG_ON() when running an RT kernel.
[ 659.343280] BUG: using smp_processor_id() in preemptible [00000000] code: sg_reset/3646 [ 659.343282] caller is qedf_execute_tmf+0x8b/0x360 [qedf]
--- drivers/scsi/qedf/qedf_io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/qedf/qedf_io.c +3 -3
@@ -2351,9 +2351,6 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, io_req->fcport = fcport; io_req->cmd_type =QEDF_TASK_MGMT_CMD ; -/* Record which cpu this request is associated with */ - io_req->cpu =smp_processor_id (); -/* Set TM flags */ io_req->io_req_flags =QEDF_READ ; io_req->data_xfer_len =0 ;
@@ -2375,6 +2372,9 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd,spin_lock_irqsave (&fcport->rport_lock, flags); +/* Record which cpu this request is associated with */ + io_req->cpu =smp_processor_id (); + sqe_idx =qedf_get_sqe_idx (fcport); sqe = &fcport->sq[sqe_idx];memset (sqe,0 ,sizeof (struct fcoe_wqe ));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 6/108 crypto: aead,cipher - zeroize key buffer after use
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hailey Mothershead <[email protected]>
[ Upstream commit 23e4099bdc3c8381992f9eb975c79196d6755210 ]
I.G 9.7.B for FIPS 140-3 specifies that variables temporarily holding cryptographic information should be zeroized once they are no longer needed. Accomplish this by using kfree_sensitive for buffers that previously held the private key.
--- crypto/aead.c | 3 +-- crypto/cipher.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
crypto/aead.c +1 -2
@@ -35,8 +35,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key, alignbuffer = (u8 *)ALIGN ((unsigned long )buffer, alignmask +1 );memcpy (alignbuffer, key, keylen); ret =crypto_aead_alg (tfm)->setkey (tfm, alignbuffer, keylen); -memset (alignbuffer,0 , keylen); -kfree (buffer); +kfree_sensitive (buffer);return ret; }
crypto/cipher.c +1 -2
@@ -33,8 +33,7 @@ static int setkey_unaligned(struct crypto_cipher *tfm, const u8 *key, alignbuffer = (u8 *)ALIGN ((unsigned long )buffer, alignmask +1 );memcpy (alignbuffer, key, keylen); ret = cia->cia_setkey (crypto_cipher_tfm (tfm), alignbuffer, keylen); -memset (alignbuffer,0 , keylen); -kfree (buffer); +kfree_sensitive (buffer);return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 7/108 drm/amdgpu: Initialize timestamp for some legacy SOCs
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Jun <[email protected]>
[ Upstream commit 2e55bcf3d742a4946d862b86e39e75a95cc6f1c0 ]
Initialize the interrupt timestamp for some legacy SOCs to fix the coverity issue "Uninitialized scalar variable"
--- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +8 -0
@@ -413,6 +413,14 @@ void amdgpu_irq_dispatch(struct amdgpu_device *adev,int r; entry.iv_entry = (const uint32_t *)&ih->ring[ring_index]; + +/* +* timestamp is not supported on some legacy SOCs (cik, cz, iceland, +* si and tonga), so initialize timestamp and timestamp_src to 0 +*/ + entry.timestamp =0 ; + entry.timestamp_src =0 ; +amdgpu_ih_decode_iv (adev, &entry);trace_amdgpu_iv (ih - &adev->irq.ih, &entry);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 8/108 drm/amd/display: Check index msg_id before read or write
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Hung <[email protected]>
[ Upstream commit 59d99deb330af206a4541db0c4da8f73880fba03 ]
[WHAT]msg_id is used as an array index and it cannot be a negative value, and therefore cannot be equal to MOD_HDCP_MESSAGE_ID_INVALID (-1).
[HOW]
Check whether msg_id is valid before reading and setting.
This fixes 4 OVERRUN issues reported by Coverity.
--- drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c +8 -0
@@ -156,6 +156,10 @@ static enum mod_hdcp_status read(struct mod_hdcp *hdcp,uint32_t cur_size =0 ;uint32_t data_offset =0 ; +if (msg_id ==MOD_HDCP_MESSAGE_ID_INVALID ) { +return MOD_HDCP_STATUS_DDC_FAILURE ; + } +if (is_dp_hdcp (hdcp)) {while (buf_len >0 ) { cur_size =MIN (buf_len,HDCP_MAX_AUX_TRANSACTION_SIZE );
@@ -215,6 +219,10 @@ static enum mod_hdcp_status write(struct mod_hdcp *hdcp,uint32_t cur_size =0 ;uint32_t data_offset =0 ; +if (msg_id ==MOD_HDCP_MESSAGE_ID_INVALID ) { +return MOD_HDCP_STATUS_DDC_FAILURE ; + } +if (is_dp_hdcp (hdcp)) {while (buf_len >0 ) { cur_size =MIN (buf_len,HDCP_MAX_AUX_TRANSACTION_SIZE );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 9/108 drm/amd/display: Check pipe offset before setting vblank
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Hung <[email protected]>
[ Upstream commit 5396a70e8cf462ec5ccf2dc8de103c79de9489e6 ]
pipe_ctx has a size of MAX_PIPES so checking its index before accessing the array.
This fixes an OVERRUN issue reported by Coverity.
--- .../drm/amd/display/dc/irq/dce110/irq_service_dce110.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +6 -2
@@ -211,8 +211,12 @@ bool dce110_vblank_set(struct irq_service *irq_service, info->ext_id);uint8_t pipe_offset = dal_irq_src -IRQ_TYPE_VBLANK ; -struct timing_generator *tg = - dc->current_state->res_ctx.pipe_ctx[pipe_offset].stream_res.tg; +struct timing_generator *tg; + +if (pipe_offset >=MAX_PIPES ) +return false; + + tg = dc->current_state->res_ctx.pipe_ctx[pipe_offset].stream_res.tg;if (enable) {if (!tg || !tg->funcs->arm_vert_intr (tg,2 )) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainercover 5.10.222-rc1 review
This is the start of the stable review cycle for the 5.10.222 release. There are 108 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 18 Jul 2024 15:27:21 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.222-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.222-rc1
Dan Carpenter <[email protected]>
i2c: rcar: fix error code in probe()
Wolfram Sang <[email protected]>
i2c: rcar: clear NO_RXDMA flag after resetting
Wolfram Sang <[email protected]>
i2c: rcar: ensure Gen3+ reset does not disturb local targets
Wolfram Sang <[email protected]>
i2c: rcar: introduce Gen4 devices
Wolfram Sang <[email protected]>
i2c: rcar: reset controller is mandatory for Gen3+
Geert Uytterhoeven <[email protected]>
i2c: rcar: Add R-Car Gen4 support
Wolfram Sang <[email protected]>
i2c: mark HostNotify target address as used
Wolfram Sang <[email protected]>
i2c: rcar: bring hardware to known state when probing
Russell King <[email protected]>
arm64/bpf: Remove 128MB limit for BPF JIT programs
Ryusuke Konishi <[email protected]>
nilfs2: fix kernel bug on rename operation of broken directory
Eduard Zingerman <[email protected]>
bpf: Allow reads from uninit stack
Eric Dumazet <[email protected]>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <[email protected]>
ipv6: annotate data-races around cnf.disable_ipv6
Ard Biesheuvel <[email protected]>
efi: ia64: move IA64-only declarations to new asm/efi.h header
Jim Mattson <[email protected]>
x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk
Jason A. Donenfeld <[email protected]>
wireguard: send: annotate intentional data race in checking empty queue
Jason A. Donenfeld <[email protected]>
wireguard: queueing: annotate intentional data race in cpu round robin
Helge Deller <[email protected]>
wireguard: allowedips: avoid unaligned 64-bit memory accesses
Ilya Dryomov <[email protected]>
libceph: fix race between delayed_work() and ceph_monc_stop()
Edson Juliano Drosdeck <[email protected]>
ALSA: hda/realtek: Limit mic boost on VAIO PRO PX
Nazar Bilinskyi <[email protected]>
ALSA: hda/realtek: Enable Mute LED on HP 250 G7
Joy Chakraborty <[email protected]>
nvmem: meson-efuse: Fix return value of nvmem callbacks
He Zhe <[email protected]>
hpet: Support 32-bit userspace
Alan Stern <[email protected]>
USB: core: Fix duplicate endpoint bug by clearing reserved bits in the descriptor
Lee Jones <[email protected]>
usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()
WangYuli <[email protected]>
USB: Add USB_QUIRK_NO_SET_INTF quirk for START BP-850k
Dmitry Smirnov <[email protected]>
USB: serial: mos7840: fix crash on resume
Vanillan Wang <[email protected]>
USB: serial: option: add Rolling RW350-GL variants
Mank Wang <[email protected]>
USB: serial: option: add Netprisma LCUK54 series modules
Slark Xiao <[email protected]>
USB: serial: option: add support for Foxconn T99W651
Bjørn Mork <[email protected]>
USB: serial: option: add Fibocom FM350-GL
Daniele Palmas <[email protected]>
USB: serial: option: add Telit FN912 rmnet compositions
Daniele Palmas <[email protected]>
USB: serial: option: add Telit generic core-dump composition
Ronald Wahl <[email protected]>
net: ks8851: Fix potential TX stall after interface reopen
Eric Dumazet <[email protected]>
tcp: avoid too many retransmit packets
Eric Dumazet <[email protected]>
tcp: use signed arithmetic in tcp_rtx_probe0_timed_out()
Michal Mazur <[email protected]>
octeontx2-af: fix detection of IP layer
Chen Ni <[email protected]>
ARM: davinci: Convert comma to semicolon
Sven Schnelle <[email protected]>
s390: Mark psw in __load_psw_mask() as __unitialized
Chengen Du <[email protected]>
net/sched: Fix UAF when resolving a clash
Kuniyuki Iwashima <[email protected]>
udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port().
Oleksij Rempel <[email protected]>
ethtool: netlink: do not return SQI value if link is down
Dmitry Antipov <[email protected]>
ppp: reject claimed-as-LCP but actually malformed packets
Aleksander Jan Bajkowski <[email protected]>
net: ethernet: lantiq_etop: fix double free in detach
Aleksander Jan Bajkowski <[email protected]>
net: lantiq_etop: add blank line after declaration
Aleksandr Mishin <[email protected]>
octeontx2-af: Fix incorrect value output on error path in rvu_check_rsrc_availability()
Neal Cardwell <[email protected]>
tcp: fix incorrect undo caused by DSACK of TLP retransmit
Brian Foster <[email protected]>
vfs: don't mod negative dentry count when on shrinker list
linke li <[email protected]>
fs/dcache: Re-use value stored to dentry->d_flags instead of re-reading
Jeff Layton <[email protected]>
filelock: fix potential use-after-free in posix_lock_inode
Waiman Long <[email protected]>
mm: prevent derefencing NULL ptr in pfn_section_valid()
Ryusuke Konishi <[email protected]>
nilfs2: fix incorrect inode allocation from reserved inodes
Masahiro Yamada <[email protected]>
kbuild: fix short log for AS in link-vmlinux.sh
Sagi Grimberg <[email protected]>
nvmet: fix a possible leak when destroy a ctrl during qp establishment
hmtheboy154 <[email protected]>
platform/x86: touchscreen_dmi: Add info for the EZpad 6s Pro
hmtheboy154 <[email protected]>
platform/x86: touchscreen_dmi: Add info for GlobalSpace SolT IVW 11.6" tablet
Kundan Kumar <[email protected]>
nvme: adjust multiples of NVME_CTRL_PAGE_SIZE in offset
Nilay Shroff <[email protected]>
nvme-multipath: find NUMA path only for online numa-node
Jian-Hong Pan <[email protected]>
ALSA: hda/realtek: Enable headset mic of JP-IK LEAP W502 with ALC897
Piotr Wojtaszczyk <[email protected]>
i2c: pnx: Fix potential deadlock warning from del_timer_sync() call in isr
Mauro Carvalho Chehab <[email protected]>
media: dw2102: fix a potential buffer overflow
GUO Zihua <[email protected]>
ima: Avoid blocking in RCU read-side critical section
Wang Yufen <[email protected]>
bpf, sockmap: Fix sk->sk_forward_alloc warn_on in sk_stream_kill_queues
Ghadi Elie Rahme <[email protected]>
bnx2x: Fix multiple UBSAN array-index-out-of-bounds
Miquel Raynal <[email protected]>
mtd: rawnand: Bypass a couple of sanity checks during NAND identification
Alex Deucher <[email protected]>
drm/amdgpu/atomfirmware: silence UBSAN warning
Ma Ke <[email protected]>
drm/nouveau: fix null pointer dereference in nouveau_connector_get_modes
Jan Kara <[email protected]>
Revert "mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again"
Jan Kara <[email protected]>
fsnotify: Do not generate events for O_PATH file descriptors
Jimmy Assarsson <[email protected]>
can: kvaser_usb: Explicitly initialize family in leafimx driver_info struct
Zijun Hu <[email protected]>
Bluetooth: qca: Fix BT enable failure again for QCA6390 after warm reboot
Jan Kara <[email protected]>
mm: avoid overflows in dirty throttling logic
Jinliang Zheng <[email protected]>
mm: optimize the redundant loop of mm_update_owner_next()
Ryusuke Konishi <[email protected]>
nilfs2: add missing check for inode numbers on directory entries
Ryusuke Konishi <[email protected]>
nilfs2: fix inode number range checks
Shigeru Yoshida <[email protected]>
inet_diag: Initialize pad field in struct inet_diag_req_v2
Zijian Zhang <[email protected]>
selftests: make order checking verbose in msg_zerocopy selftest
Zijian Zhang <[email protected]>
selftests: fix OOM in msg_zerocopy selftest
Sam Sun <[email protected]>
bonding: Fix out-of-bounds read in bond_option_arp_ip_targets_set()
Jozef Hopko <[email protected]>
wifi: wilc1000: fix ies_len type in connect path
Jakub Kicinski <[email protected]>
tcp_metrics: validate source addr length
Neal Cardwell <[email protected]>
UPSTREAM: tcp: fix DSACK undo in fast recovery to call tcp_try_to_open()
Holger Dengler <[email protected]>
s390/pkey: Wipe sensitive data on failure
Wang Yong <[email protected]>
jffs2: Fix potential illegal address access in jffs2_free_inode
Jose E. Marchesi <[email protected]>
bpf: Avoid uninitialized value in BPF_CORE_READ_BITFIELD
Greg Kurz <[email protected]>
powerpc/xmon: Check cpu id in commands "c#", "dp#" and "dx#"
Mickaël Salaün <[email protected]>
kunit: Fix timeout message
Mike Marshall <[email protected]>
orangefs: fix out-of-bounds fsid access
Michael Ellerman <[email protected]>
powerpc/64: Set _IO_BASE to POISON_POINTER_DELTA not 0 for CONFIG_PCI=n
Heiner Kallweit <[email protected]>
i2c: i801: Annotate apanel_addr as __ro_after_init
Ricardo Ribalda <[email protected]>
media: dvb-frontends: tda10048: Fix integer overflow
Ricardo Ribalda <[email protected]>
media: s2255: Use refcount_t instead of atomic_t for num_channels
Ricardo Ribalda <[email protected]>
media: dvb-frontends: tda18271c2dd: Remove casting during div
Simon Horman <[email protected]>
net: dsa: mv88e6xxx: Correct check for empty list
Erick Archer <[email protected]>
Input: ff-core - prefer struct_size over open coded arithmetic
Jean Delvare <[email protected]>
firmware: dmi: Stop decoding on broken entry
Erick Archer <[email protected]>
sctp: prefer struct_size over open coded arithmetic
Michael Bunk <[email protected]>
media: dw2102: Don't translate i2c read into write
Alex Hung <[email protected]>
drm/amd/display: Skip finding free audio for unknown engine_id
Alex Hung <[email protected]>
drm/amd/display: Check pipe offset before setting vblank
Alex Hung <[email protected]>
drm/amd/display: Check index msg_id before read or write
Ma Jun <[email protected]>
drm/amdgpu: Initialize timestamp for some legacy SOCs
Hailey Mothershead <[email protected]>
crypto: aead,cipher - zeroize key buffer after use
John Meneghini <[email protected]>
scsi: qedf: Make qedf_execute_tmf() non-preemptible
Michael Guralnik <[email protected]>
IB/core: Implement a limit on UMAD receive List
Ricardo Ribalda <[email protected]>
media: dvb-usb: dib0700_devices: Add missing release_firmware()
Ricardo Ribalda <[email protected]>
media: dvb: as102-fe: Fix as10x_register_addr packing
Erico Nunes <[email protected]>
drm/lima: fix shared irq handling on driver remove
-------------
Diffstat:
Makefile | 4 +- arch/arm/mach-davinci/pm.c | 2 +- arch/arm64/include/asm/extable.h | 9 - arch/arm64/include/asm/memory.h | 5 +- arch/arm64/kernel/traps.c | 2 +- arch/arm64/mm/extable.c | 3 +- arch/arm64/mm/ptdump.c | 2 - arch/arm64/net/bpf_jit_comp.c | 7 +- arch/ia64/include/asm/efi.h | 13 ++ arch/ia64/kernel/efi.c | 1 + arch/ia64/kernel/machine_kexec.c | 1 + arch/ia64/kernel/mca.c | 1 + arch/ia64/kernel/smpboot.c | 1 + arch/ia64/kernel/time.c | 1 + arch/ia64/kernel/uncached.c | 4 +- arch/ia64/mm/contig.c | 1 + arch/ia64/mm/discontig.c | 1 + arch/ia64/mm/init.c | 1 + arch/powerpc/include/asm/io.h | 2 +- arch/powerpc/xmon/xmon.c | 6 +- arch/s390/include/asm/processor.h | 2 +- arch/x86/lib/retpoline.S | 2 +- crypto/aead.c | 3 +- crypto/cipher.c | 3 +- drivers/bluetooth/hci_qca.c | 18 +- drivers/char/hpet.c | 34 +++- drivers/firmware/dmi_scan.c | 11 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 8 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 8 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 8 + drivers/gpu/drm/amd/include/atomfirmware.h | 2 +- drivers/gpu/drm/lima/lima_gp.c | 2 + drivers/gpu/drm/lima/lima_mmu.c | 5 + drivers/gpu/drm/lima/lima_pp.c | 4 + drivers/gpu/drm/nouveau/nouveau_connector.c | 3 + drivers/i2c/busses/i2c-i801.c | 2 +- drivers/i2c/busses/i2c-pnx.c | 48 +---- drivers/i2c/busses/i2c-rcar.c | 66 ++++--- drivers/i2c/i2c-core-base.c | 1 + drivers/infiniband/core/user_mad.c | 21 +- drivers/input/ff-core.c | 7 +- drivers/media/dvb-frontends/as102_fe_types.h | 2 +- drivers/media/dvb-frontends/tda10048.c | 9 +- drivers/media/dvb-frontends/tda18271c2dd.c | 4 +- drivers/media/usb/dvb-usb/dib0700_devices.c | 18 +- drivers/media/usb/dvb-usb/dw2102.c | 120 +++++++----- drivers/media/usb/s2255/s2255drv.c | 20 +- drivers/mtd/nand/raw/nand_base.c | 57 +++--- drivers/net/bonding/bond_options.c | 6 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 1 + drivers/net/dsa/mv88e6xxx/chip.c | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- drivers/net/ethernet/lantiq_etop.c | 5 +- drivers/net/ethernet/marvell/octeontx2/af/npc.h | 8 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- drivers/net/ethernet/micrel/ks8851_common.c | 2 +- drivers/net/ppp/ppp_generic.c | 15 ++ drivers/net/wireguard/allowedips.c | 4 +- drivers/net/wireguard/queueing.h | 4 +- drivers/net/wireguard/send.c | 2 +- drivers/net/wireless/microchip/wilc1000/hif.c | 3 +- drivers/nvme/host/multipath.c | 2 +- drivers/nvme/host/pci.c | 3 +- drivers/nvme/target/core.c | 9 + drivers/nvmem/meson-efuse.c | 14 +- drivers/platform/x86/touchscreen_dmi.c | 36 ++++ drivers/s390/crypto/pkey_api.c | 4 +- drivers/scsi/qedf/qedf_io.c | 6 +- drivers/usb/core/config.c | 18 +- drivers/usb/core/quirks.c | 3 + drivers/usb/gadget/configfs.c | 3 + drivers/usb/serial/mos7840.c | 45 +++++ drivers/usb/serial/option.c | 38 ++++ fs/dcache.c | 12 +- fs/jffs2/super.c | 1 + fs/locks.c | 2 +- fs/nilfs2/alloc.c | 18 +- fs/nilfs2/alloc.h | 4 +- fs/nilfs2/dat.c | 2 +- fs/nilfs2/dir.c | 38 +++- fs/nilfs2/ifile.c | 7 +- fs/nilfs2/nilfs.h | 10 +- fs/nilfs2/the_nilfs.c | 6 + fs/nilfs2/the_nilfs.h | 2 +- fs/orangefs/super.c | 3 +- include/linux/bpf.h | 1 + include/linux/efi.h | 6 - include/linux/fsnotify.h | 8 +- include/linux/lsm_hook_defs.h | 2 +- include/linux/mmzone.h | 3 +- include/linux/security.h | 5 +- include/linux/skmsg.h | 1 + kernel/auditfilter.c | 5 +- kernel/bpf/verifier.c | 11 +- kernel/exit.c | 2 + lib/kunit/try-catch.c | 3 +- mm/page-writeback.c | 32 +++- net/ceph/mon_client.c | 14 +- net/core/skmsg.c | 1 + net/core/sock_map.c | 22 +++ net/ethtool/linkstate.c | 41 ++-- net/ipv4/inet_diag.c | 2 + net/ipv4/tcp_bpf.c | 1 + net/ipv4/tcp_input.c | 13 +- net/ipv4/tcp_metrics.c | 1 + net/ipv4/tcp_timer.c | 31 ++- net/ipv4/udp.c | 4 +- net/ipv6/addrconf.c | 9 +- net/ipv6/ip6_input.c | 2 +- net/ipv6/ip6_output.c | 2 +- net/sched/act_ct.c | 8 + net/sctp/socket.c | 7 +- scripts/link-vmlinux.sh | 2 +- security/apparmor/audit.c | 6 +- security/apparmor/include/audit.h | 2 +- security/integrity/ima/ima.h | 2 +- security/integrity/ima/ima_policy.c | 15 +- security/security.c | 6 +- security/selinux/include/audit.h | 4 +- security/selinux/ss/services.c | 5 +- security/smack/smack_lsm.c | 4 +- sound/pci/hda/patch_realtek.c | 12 ++ tools/lib/bpf/bpf_core_read.h | 1 + .../selftests/bpf/progs/test_global_func10.c | 31 +++ tools/testing/selftests/bpf/verifier/calls.c | 13 +- .../selftests/bpf/verifier/helper_access_var_len.c | 104 ++++++---- tools/testing/selftests/bpf/verifier/int_ptr.c | 9 +- .../selftests/bpf/verifier/search_pruning.c | 13 +- tools/testing/selftests/bpf/verifier/sock.c | 27 --- tools/testing/selftests/bpf/verifier/spill_fill.c | 211 +++++++++++++++++++++ tools/testing/selftests/bpf/verifier/var_off.c | 52 ----- tools/testing/selftests/net/msg_zerocopy.c | 14 +- 133 files changed, 1203 insertions(+), 469 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 30/108 bonding: Fix out-of-bounds read in bond_option_arp_ip_targets_set()
5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Sun <[email protected]>
[ Upstream commit e271ff53807e8f2c628758290f0e499dbe51cb3d ]
In function bond_option_arp_ip_targets_set(), if newval->string is an empty string, newval->string+1 will point to the byte after the string, causing an out-of-bound read.
BUG: KASAN: slab-out-of-bounds in strlen+0x7d/0xa0 lib/string.c:418 Read of size 1 at addr ffff8881119c4781 by task syz-executor665/8107 CPU: 1 PID: 8107 Comm: syz-executor665 Not tainted 6.7.0-rc7 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xd9/0x150 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:364 [inline] print_report+0xc1/0x5e0 mm/kasan/report.c:475 kasan_report+0xbe/0xf0 mm/kasan/report.c:588 strlen+0x7d/0xa0 lib/string.c:418 __fortify_strlen include/linux/fortify-string.h:210 [inline] in4_pton+0xa3/0x3f0 net/core/utils.c:130 bond_option_arp_ip_targets_set+0xc2/0x910 drivers/net/bonding/bond_options.c:1201 __bond_opt_set+0x2a4/0x1030 drivers/net/bonding/bond_options.c:767 __bond_opt_set_notify+0x48/0x150 drivers/net/bonding/bond_options.c:792 bond_opt_tryset_rtnl+0xda/0x160 drivers/net/bonding/bond_options.c:817 bonding_sysfs_store_option+0xa1/0x120 drivers/net/bonding/bond_sysfs.c:156 dev_attr_store+0x54/0x80 drivers/base/core.c:2366 sysfs_kf_write+0x114/0x170 fs/sysfs/file.c:136 kernfs_fop_write_iter+0x337/0x500 fs/kernfs/file.c:334 call_write_iter include/linux/fs.h:2020 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x96a/0xd80 fs/read_write.c:584 ksys_write+0x122/0x250 fs/read_write.c:637 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b ---[ end trace ]---
Fix it by adding a check of string length before using it.
--- drivers/net/bonding/bond_options.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/bonding/bond_options.c +3 -3
@@ -1100,9 +1100,9 @@ static int bond_option_arp_ip_targets_set(struct bonding *bond,__be32 target;if (newval->string) { -if (!in4_pton (newval->string+1 ,-1 , (u8 *)&target,-1 ,NULL )) { -netdev_err (bond->dev,"invalid ARP target %pI4 specified\n" , - &target); +if (strlen (newval->string) <1 || + !in4_pton (newval->string +1 ,-1 , (u8 *)&target,-1 ,NULL )) { +netdev_err (bond->dev,"invalid ARP target specified\n" );return ret; }if (newval->string[0 ] =='+' )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 39/108 can: kvaser_usb: Explicitly initialize family in leafimx driver_info struct
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jimmy Assarsson <[email protected]>
commit 19d5b2698c35b2132a355c67b4d429053804f8cc upstream.
Explicitly set the 'family' driver_info struct member for leafimx. Previously, the correct operation relied on KVASER_LEAF being the first defined value in enum kvaser_usb_leaf_family.
--- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +1 -0
@@ -114,6 +114,7 @@ static const struct kvaser_usb_driver_instatic const struct kvaser_usb_driver_info kvaser_usb_driver_info_leafimx = { .quirks =0 , + .family =KVASER_LEAF , .ops = &kvaser_usb_leaf_dev_ops, };
Greg Kroah-Hartman
maintainerPATCH 40/108 fsnotify: Do not generate events for O_PATH file descriptors
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 702eb71fd6501b3566283f8c96d7ccc6ddd662e9 upstream.
Currently we will not generate FS_OPEN events for O_PATH file descriptors but we will generate FS_CLOSE events for them. This is asymmetry is confusing. Arguably no fsnotify events should be generated for O_PATH file descriptors as they cannot be used to access or modify file content, they are just convenient handles to file objects like paths. So fix the asymmetry by stopping to generate FS_CLOSE for O_PATH file descriptors.
--- include/linux/fsnotify.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
include/linux/fsnotify.h +7 -1
@@ -93,7 +93,13 @@ static inline int fsnotify_file(struct f {const struct path *path = &file->f_path; -if (file->f_mode &FMODE_NONOTIFY ) +/* +* FMODE_NONOTIFY are fds generated by fanotify itself which should not +* generate new events. We also don't want to generate events for +* FMODE_PATH fds (involves open & close events) as they are just +* handle creation / destruction events and not "real" file events. +*/ +if (file->f_mode & (FMODE_NONOTIFY |FMODE_PATH ))return 0 ;return fsnotify_parent (path->dentry, mask, path,FSNOTIFY_EVENT_PATH );
Greg Kroah-Hartman
maintainerPATCH 41/108 Revert "mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 30139c702048f1097342a31302cbd3d478f50c63 upstream.
Patch series "mm: Avoid possible overflows in dirty throttling".
Dirty throttling logic assumes dirty limits in page units fit into 32-bits. This patch series makes sure this is true (see patch 2/2 for more details).
This patch (of 2):
This reverts commit 9319b647902cbd5cc884ac08a8a6d54ce111fc78.
The commit is broken in several ways. Firstly, the removed (u64) cast from the multiplication will introduce a multiplication overflow on 32-bit archs if wb_thresh * bg_thresh >= 1<<32 (which is actually common - the default settings with 4GB of RAM will trigger this). Secondly, the div64_u64() is unnecessarily expensive on 32-bit archs. We have div64_ul() in case we want to be safe & cheap. Thirdly, if dirty thresholds are larger than 1<<32 pages, then dirty balancing is going to blow up in many other spectacular ways anyway so trying to fix one possible overflow is just moot.
--- mm/page-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page-writeback.c +1 -1
@@ -1546,7 +1546,7 @@ static inline void wb_dirty_limits(struc*/ dtc->wb_thresh =__wb_calc_thresh (dtc); dtc->wb_bg_thresh = dtc->thresh ? -div64_u64 (dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) :0 ; +div_u64 ((u64 )dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) :0 ;/* * In order to avoid the stacked BDI deadlock we need
Greg Kroah-Hartman
maintainerPATCH 42/108 drm/nouveau: fix null pointer dereference in nouveau_connector_get_modes
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Ke <[email protected]>
commit 80bec6825b19d95ccdfd3393cf8ec15ff2a749b4 upstream.
In nouveau_connector_get_modes(), the return value of drm_mode_duplicate() is assigned to mode, which will lead to a possible NULL pointer dereference on failure of drm_mode_duplicate(). Add a check to avoid npd.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/nouveau/nouveau_connector.c +3 -0
@@ -960,6 +960,9 @@ nouveau_connector_get_modes(struct drm_cstruct drm_display_mode *mode; mode =drm_mode_duplicate (dev, nv_connector->native_mode); +if (!mode) +return 0 ; +drm_mode_probed_add (connector, mode); ret =1 ; }
Greg Kroah-Hartman
maintainerPATCH 43/108 drm/amdgpu/atomfirmware: silence UBSAN warning
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit d0417264437a8fa05f894cabba5a26715b32d78e upstream.
This is a variable sized array.
--- drivers/gpu/drm/amd/include/atomfirmware.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/include/atomfirmware.h +1 -1
@@ -690,7 +690,7 @@ struct atom_gpio_pin_lut_v2_1 {struct atom_common_table_header table_header;/*the real number of this included in the structure is calcualted by using the (whole structure size - the header size)/size of atom_gpio_pin_lut */ -struct atom_gpio_pin_assignment gpio_pin[8 ]; +struct atom_gpio_pin_assignment gpio_pin[]; };
Greg Kroah-Hartman
maintainerPATCH 44/108 mtd: rawnand: Bypass a couple of sanity checks during NAND identification
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
commit 8754d9835683e8fab9a8305acdb38a3aeb9d20bd upstream.
Early during NAND identification, mtd_info fields have not yet been initialized (namely, writesize and oobsize) and thus cannot be used for sanity checks yet. Of course if there is a misuse of nand_change_read_column_op() so early we won't be warned, but there is anyway no actual check to perform at this stage as we do not yet know the NAND geometry.
So, if the fields are empty, especially mtd->writesize which is *always* set quite rapidly after identification, let's skip the sanity checks.
nand_change_read_column_op() is subject to be used early for ONFI/JEDEC identification in the very unlikely case of:
- bitflips appearing in the parameter page,
- the controller driver not supporting simple DATA_IN cycles.
As nand_change_read_column_op() uses nand_fill_column_cycles() the logic explaind above also applies in this secondary helper.
--- drivers/mtd/nand/raw/nand_base.c | 57 +++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 25 deletions(-)
drivers/mtd/nand/raw/nand_base.c +32 -25
@@ -964,28 +964,32 @@ static int nand_fill_column_cycles(struc unsigned int offset_in_page) {struct mtd_info *mtd =nand_to_mtd (chip); +bool ident_stage = !mtd->writesize; -/* Make sure the offset is less than the actual page size. */ -if (offset_in_page > mtd->writesize + mtd->oobsize) -return -EINVAL ; - -/* -* On small page NANDs, there's a dedicated command to access the OOB -* area, and the column address is relative to the start of the OOB -* area, not the start of the page. Asjust the address accordingly. -*/ -if (mtd->writesize <=512 && offset_in_page >= mtd->writesize) - offset_in_page -= mtd->writesize; - -/* -* The offset in page is expressed in bytes, if the NAND bus is 16-bit -* wide, then it must be divided by 2. -*/ -if (chip->options &NAND_BUSWIDTH_16 ) { -if (WARN_ON (offset_in_page %2 )) +/* Bypass all checks during NAND identification */ +if (likely (!ident_stage)) { +/* Make sure the offset is less than the actual page size. */ +if (offset_in_page > mtd->writesize + mtd->oobsize)return -EINVAL ; - offset_in_page /=2 ; +/* +* On small page NANDs, there's a dedicated command to access the OOB +* area, and the column address is relative to the start of the OOB +* area, not the start of the page. Asjust the address accordingly. +*/ +if (mtd->writesize <=512 && offset_in_page >= mtd->writesize) + offset_in_page -= mtd->writesize; + +/* +* The offset in page is expressed in bytes, if the NAND bus is 16-bit +* wide, then it must be divided by 2. +*/ +if (chip->options &NAND_BUSWIDTH_16 ) { +if (WARN_ON (offset_in_page %2 )) +return -EINVAL ; + + offset_in_page /=2 ; + } } addrs[0 ] = offset_in_page;
@@ -994,7 +998,7 @@ static int nand_fill_column_cycles(struc* Small page NANDs use 1 cycle for the columns, while large page NANDs * need 2 */ -if (mtd->writesize <=512 ) +if (!ident_stage && mtd->writesize <=512 )return 1 ; addrs[1 ] = offset_in_page >>8 ;
@@ -1189,16 +1193,19 @@ int nand_change_read_column_op(struct na unsigned int len, bool force_8bit) {struct mtd_info *mtd =nand_to_mtd (chip); +bool ident_stage = !mtd->writesize;if (len && !buf)return -EINVAL ; -if (offset_in_page + len > mtd->writesize + mtd->oobsize) -return -EINVAL ; +if (!ident_stage) { +if (offset_in_page + len > mtd->writesize + mtd->oobsize) +return -EINVAL ; -/* Small page NANDs do not support column change. */ -if (mtd->writesize <=512 ) -return -ENOTSUPP ; +/* Small page NANDs do not support column change. */ +if (mtd->writesize <=512 ) +return -ENOTSUPP ; + }if (nand_has_exec_op (chip)) { const struct nand_sdr_timings *sdr =
Greg Kroah-Hartman
maintainerPATCH 45/108 bnx2x: Fix multiple UBSAN array-index-out-of-bounds
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ghadi Elie Rahme <[email protected]>
commit 134061163ee5ca4759de5c24ca3bd71608891ba7 upstream.
Fix UBSAN warnings that occur when using a system with 32 physical cpu cores or more, or when the user defines a number of Ethernet queues greater than or equal to FP_SB_MAX_E1x using the num_queues module parameter.
Currently there is a read/write out of bounds that occurs on the array "struct stats_query_entry query" present inside the "bnx2x_fw_stats_req" struct in "drivers/net/ethernet/broadcom/bnx2x/bnx2x.h". Looking at the definition of the "struct stats_query_entry query" array:
struct stats_query_entry query[FP_SB_MAX_E1x+
BNX2X_FIRST_QUEUE_QUERY_IDX];
FP_SB_MAX_E1x is defined as the maximum number of fast path interrupts and has a value of 16, while BNX2X_FIRST_QUEUE_QUERY_IDX has a value of 3 meaning the array has a total size of 19.
Since accesses to "struct stats_query_entry query" are offset-ted by BNX2X_FIRST_QUEUE_QUERY_IDX, that means that the total number of Ethernet queues should not exceed FP_SB_MAX_E1x (16). However one of these queues is reserved for FCOE and thus the number of Ethernet queues should be set to [FP_SB_MAX_E1x -1] (15) if FCOE is enabled or [FP_SB_MAX_E1x] (16) if it is not.
This is also described in a comment in the source code in drivers/net/ethernet/broadcom/bnx2x/bnx2x.h just above the Macro definition of FP_SB_MAX_E1x. Below is the part of this explanation that it important for this patch
/*
* The total number of L2 queues, MSIX vectors and HW contexts (CIDs) is
* control by the number of fast-path status blocks supported by the
* device (HW/FW). Each fast-path status block (FP-SB) aka non-default
* status block represents an independent interrupts context that can
* serve a regular L2 networking queue. However special L2 queues such
* as the FCoE queue do not require a FP-SB and other components like
* the CNIC may consume FP-SB reducing the number of possible L2 queues *
* If the maximum number of FP-SB available is X then:
* a. If CNIC is supported it consumes 1 FP-SB thus the max number of
* regular L2 queues is Y=X-1
* b. In MF mode the actual number of L2 queues is Y= (X-1/MF_factor)
* c. If the FCoE L2 queue is supported the actual number of L2 queues
* is Y+1
* d. The number of irqs (MSIX vectors) is either Y+1 (one extra for
* slow-path interrupts) or Y+2 if CNIC is supported (one additional
* FP interrupt context for the CNIC).
* e. The number of HW context (CID count) is always X or X+1 if FCoE
* L2 queue is supported. The cid for the FCoE L2 queue is always X.
*/
However this driver also supports NICs that use the E2 controller which can handle more queues due to having more FP-SB represented by FP_SB_MAX_E2. Looking at the commits when the E2 support was added, it was originally using the E1x parameters: commit f2e0899f0f27 ("bnx2x: Add 57712 support"). Back then FP_SB_MAX_E2 was set to 16 the same as E1x. However the driver was later updated to take full advantage of the E2 instead of having it be limited to the capabilities of the E1x. But as far as we can tell, the array "stats_query_entry query" was still limited to using the FP-SB available to the E1x cards as part of an oversignt when the driver was updated to take full advantage of the E2, and now with the driver being aware of the greater queue size supported by E2 NICs, it causes the UBSAN warnings seen in the stack traces below.
This patch increases the size of the "stats_query_entry query" array by replacing FP_SB_MAX_E1x with FP_SB_MAX_E2 to be large enough to handle both types of NICs.
Stack traces:
UBSAN: array-index-out-of-bounds in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c:1529:11
index 20 is out of range for type 'stats_query_entry [19]'
CPU: 12 PID: 858 Comm: systemd-network Not tainted 6.9.0-060900rc7-generic
#202405052133
Hardware name: HP ProLiant DL360 Gen9/ProLiant DL360 Gen9,
BIOS P89 10/21/2019
Call Trace:
<TASK>
dump_stack_lvl+0x76/0xa0
dump_stack+0x10/0x20
__ubsan_handle_out_of_bounds+0xcb/0x110
bnx2x_prep_fw_stats_req+0x2e1/0x310 [bnx2x]
bnx2x_stats_init+0x156/0x320 [bnx2x]
bnx2x_post_irq_nic_init+0x81/0x1a0 [bnx2x]
bnx2x_nic_load+0x8e8/0x19e0 [bnx2x]
bnx2x_open+0x16b/0x290 [bnx2x]
__dev_open+0x10e/0x1d0
RIP: 0033:0x736223927a0a
Code: d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 f3 0f 1e fa 41 89 ca
64 8b 04 25 18 00 00 00 85 c0 75 15 b8 2c 00 00 00 0f 05 <48> 3d 00
f0 ff ff 77 7e c3 0f 1f 44 00 00 41 54 48 83 ec 30 44 89
RSP: 002b:00007ffc0bb2ada8 EFLAGS: 00000246 ORIG_RAX: 000000000000002c
RAX: ffffffffffffffda RBX: 0000583df50f9c78 RCX: 0000736223927a0a
RDX: 0000000000000020 RSI: 0000583df50ee510 RDI: 0000000000000003
RBP: 0000583df50d4940 R08: 00007ffc0bb2adb0 R09: 0000000000000080
R10: 0000000000000000 R11: 0000000000000246 R12: 0000583df5103ae0
R13: 000000000000035a R14: 0000583df50f9c30 R15: 0000583ddddddf00
</TASK>
---[ end trace ]---
------------[ cut here ]------------
UBSAN: array-index-out-of-bounds in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c:1546:11
index 28 is out of range for type 'stats_query_entry [19]'
CPU: 12 PID: 858 Comm: systemd-network Not tainted 6.9.0-060900rc7-generic
#202405052133
Hardware name: HP ProLiant DL360 Gen9/ProLiant DL360 Gen9,
BIOS P89 10/21/2019
Call Trace:
<TASK>
dump_stack_lvl+0x76/0xa0
dump_stack+0x10/0x20
__ubsan_handle_out_of_bounds+0xcb/0x110
bnx2x_prep_fw_stats_req+0x2fd/0x310 [bnx2x]
bnx2x_stats_init+0x156/0x320 [bnx2x]
bnx2x_post_irq_nic_init+0x81/0x1a0 [bnx2x]
bnx2x_nic_load+0x8e8/0x19e0 [bnx2x]
bnx2x_open+0x16b/0x290 [bnx2x]
__dev_open+0x10e/0x1d0
RIP: 0033:0x736223927a0a
Code: d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 f3 0f 1e fa 41 89 ca
64 8b 04 25 18 00 00 00 85 c0 75 15 b8 2c 00 00 00 0f 05 <48> 3d 00
f0 ff ff 77 7e c3 0f 1f 44 00 00 41 54 48 83 ec 30 44 89
RSP: 002b:00007ffc0bb2ada8 EFLAGS: 00000246 ORIG_RAX: 000000000000002c
RAX: ffffffffffffffda RBX: 0000583df50f9c78 RCX: 0000736223927a0a
RDX: 0000000000000020 RSI: 0000583df50ee510 RDI: 0000000000000003
RBP: 0000583df50d4940 R08: 00007ffc0bb2adb0 R09: 0000000000000080
R10: 0000000000000000 R11: 0000000000000246 R12: 0000583df5103ae0
R13: 000000000000035a R14: 0000583df50f9c30 R15: 0000583ddddddf00
</TASK>
---[ end trace ]---
------------[ cut here ]------------
UBSAN: array-index-out-of-bounds in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c:1895:8
index 29 is out of range for type 'stats_query_entry [19]'
CPU: 13 PID: 163 Comm: kworker/u96:1 Not tainted 6.9.0-060900rc7-generic
#202405052133
Hardware name: HP ProLiant DL360 Gen9/ProLiant DL360 Gen9,
BIOS P89 10/21/2019
Workqueue: bnx2x bnx2x_sp_task [bnx2x]
Call Trace:
<TASK>
dump_stack_lvl+0x76/0xa0
dump_stack+0x10/0x20
__ubsan_handle_out_of_bounds+0xcb/0x110
bnx2x_iov_adjust_stats_req+0x3c4/0x3d0 [bnx2x]
bnx2x_storm_stats_post.part.0+0x4a/0x330 [bnx2x]
? bnx2x_hw_stats_post+0x231/0x250 [bnx2x]
bnx2x_stats_start+0x44/0x70 [bnx2x]
bnx2x_stats_handle+0x149/0x350 [bnx2x]
bnx2x_attn_int_asserted+0x998/0x9b0 [bnx2x]
bnx2x_sp_task+0x491/0x5c0 [bnx2x]
process_one_work+0x18d/0x3f0
</TASK>
---[ end trace ]------ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +1 -1
@@ -1262,7 +1262,7 @@ enum {struct bnx2x_fw_stats_req {struct stats_query_header hdr; -struct stats_query_entry query[FP_SB_MAX_E1x+ +struct stats_query_entry query[FP_SB_MAX_E2 +BNX2X_FIRST_QUEUE_QUERY_IDX ]; };
Greg Kroah-Hartman
maintainerPATCH 46/108 bpf, sockmap: Fix sk->sk_forward_alloc warn_on in sk_stream_kill_queues
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Yufen <[email protected]>
commit d8616ee2affcff37c5d315310da557a694a3303d upstream.
During TCP sockmap redirect pressure test, the following warning is triggered:
WARNING: CPU: 3 PID: 2145 at net/core/stream.c:205 sk_stream_kill_queues+0xbc/0xd0 CPU: 3 PID: 2145 Comm: iperf Kdump: loaded Tainted: G W 5.10.0+ #9 Call Trace: inet_csk_destroy_sock+0x55/0x110 inet_csk_listen_stop+0xbb/0x380 tcp_close+0x41b/0x480 inet_release+0x42/0x80 __sock_release+0x3d/0xa0 sock_close+0x11/0x20 __fput+0x9d/0x240 task_work_run+0x62/0x90 exit_to_user_mode_prepare+0x110/0x120 syscall_exit_to_user_mode+0x27/0x190 entry_SYSCALL_64_after_hwframe+0x44/0xa9
The reason we observed is that:
When the listener is closing, a connection may have completed the three-way handshake but not accepted, and the client has sent some packets. The child sks in accept queue release by inet_child_forget()->inet_csk_destroy_sock(), but psocks of child sks have not released.
To fix, add sock_map_destroy to release psocks.
[ Conflict in include/linux/bpf.h due to function declaration position
and remove non-existed sk_psock_stop helper from sock_map_destroy. ]
--- include/linux/bpf.h | 1 + include/linux/skmsg.h | 1 + net/core/skmsg.c | 1 + net/core/sock_map.c | 22 ++++++++++++++++++++++ net/ipv4/tcp_bpf.c | 1 + 5 files changed, 26 insertions(+)
include/linux/bpf.h +1 -0
@@ -1800,6 +1800,7 @@ int sock_map_get_from_fd(const union bpfint sock_map_prog_detach (const union bpf_attr *attr,enum bpf_prog_type ptype);int sock_map_update_elem_sys (struct bpf_map *map,void *key,void *value,u64 flags);void sock_map_unhash (struct sock *sk); +void sock_map_destroy (struct sock *sk);void sock_map_close (struct sock *sk,long timeout);#else static inline int sock_map_prog_update(struct bpf_map *map,
include/linux/skmsg.h +1 -0
@@ -98,6 +98,7 @@ struct sk_psock {spinlock_t link_lock;refcount_t refcnt;void (*saved_unhash)(struct sock *sk); +void (*saved_destroy)(struct sock *sk);void (*saved_close)(struct sock *sk,long timeout);void (*saved_write_space)(struct sock *sk);struct proto *sk_proto;
net/core/skmsg.c +1 -0
@@ -599,6 +599,7 @@ struct sk_psock *sk_psock_init(struct so psock->eval = __SK_NONE; psock->sk_proto = prot; psock->saved_unhash = prot->unhash; + psock->saved_destroy = prot->destroy; psock->saved_close = prot->close; psock->saved_write_space = sk->sk_write_space;
net/core/sock_map.c +22 -0
@@ -1566,6 +1566,28 @@ void sock_map_unhash(struct sock *sk)saved_unhash (sk); } +void sock_map_destroy (struct sock *sk) +{ +void (*saved_destroy)(struct sock *sk); +struct sk_psock *psock; + +rcu_read_lock (); + psock =sk_psock_get (sk); +if (unlikely (!psock)) { +rcu_read_unlock (); +if (sk->sk_prot->destroy) + sk->sk_prot->destroy (sk); +return ; + } + + saved_destroy = psock->saved_destroy; +sock_map_remove_links (sk, psock); +rcu_read_unlock (); +sk_psock_put (sk, psock); +saved_destroy (sk); +} +EXPORT_SYMBOL_GPL (sock_map_destroy); +void sock_map_close (struct sock *sk,long timeout) {void (*saved_close)(struct sock *sk,long timeout);
net/ipv4/tcp_bpf.c +1 -0
@@ -582,6 +582,7 @@ static void tcp_bpf_rebuild_protos(struc struct proto *base) { prot[TCP_BPF_BASE ] = *base; + prot[TCP_BPF_BASE ].destroy = sock_map_destroy; prot[TCP_BPF_BASE ].close = sock_map_close; prot[TCP_BPF_BASE ].recvmsg = tcp_bpf_recvmsg; prot[TCP_BPF_BASE ].stream_memory_read = tcp_bpf_stream_read;
Greg Kroah-Hartman
maintainerPATCH 47/108 ima: Avoid blocking in RCU read-side critical section
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: GUO Zihua <[email protected]>
commit 9a95c5bfbf02a0a7f5983280fe284a0ff0836c34 upstream.
A panic happens in ima_match_policy:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000010
PGD 42f873067 P4D 0
Oops: 0000 [#1] SMP NOPTI
CPU: 5 PID: 1286325 Comm: kubeletmonit.sh
Kdump: loaded Tainted: P
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996),
BIOS 0.0.0 02/06/2015
RIP: 0010:ima_match_policy+0x84/0x450
Code: 49 89 fc 41 89 cf 31 ed 89 44 24 14 eb 1c 44 39
7b 18 74 26 41 83 ff 05 74 20 48 8b 1b 48 3b 1d
f2 b9 f4 00 0f 84 9c 01 00 00 <44> 85 73 10 74 ea
44 8b 6b 14 41 f6 c5 01 75 d4 41 f6 c5 02 74 0f
RSP: 0018:ff71570009e07a80 EFLAGS: 00010207
RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000200
RDX: ffffffffad8dc7c0 RSI: 0000000024924925 RDI: ff3e27850dea2000
RBP: 0000000000000000 R08: 0000000000000000 R09: ffffffffabfce739
R10: ff3e27810cc42400 R11: 0000000000000000 R12: ff3e2781825ef970
R13: 00000000ff3e2785 R14: 000000000000000c R15: 0000000000000001
FS: 00007f5195b51740(0000)
GS:ff3e278b12d40000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000010 CR3: 0000000626d24002 CR4: 0000000000361ee0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
ima_get_action+0x22/0x30
process_measurement+0xb0/0x830
? page_add_file_rmap+0x15/0x170
? alloc_set_pte+0x269/0x4c0
? prep_new_page+0x81/0x140
? simple_xattr_get+0x75/0xa0
? selinux_file_open+0x9d/0xf0
ima_file_check+0x64/0x90
path_openat+0x571/0x1720
do_filp_open+0x9b/0x110
? page_counter_try_charge+0x57/0xc0
? files_cgroup_alloc_fd+0x38/0x60
? __alloc_fd+0xd4/0x250
? do_sys_open+0x1bd/0x250
do_sys_open+0x1bd/0x250
do_syscall_64+0x5d/0x1d0
entry_SYSCALL_64_after_hwframe+0x65/0xcaCommit c7423dbdbc9e ("ima: Handle -ESTALE returned by ima_filter_rule_match()") introduced call to ima_lsm_copy_rule within a RCU read-side critical section which contains kmalloc with GFP_KERNEL. This implies a possible sleep and violates limitations of RCU read-side critical sections on non-PREEMPT systems.
Sleeping within RCU read-side critical section might cause synchronize_rcu() returning early and break RCU protection, allowing a UAF to happen.
The root cause of this issue could be described as follows:
| Thread A | Thread B | | |ima_match_policy | | | rcu_read_lock | |ima_lsm_update_rule | | | synchronize_rcu | | | | kmalloc(GFP_KERNEL)| | | sleep | ==> synchronize_rcu returns early | kfree(entry) | | | | entry = entry->next|
==> UAF happens and entry now becomes NULL (or could be anything).
| | entry->action |
==> Accessing entry might cause panic.
To fix this issue, we are converting all kmalloc that is called within RCU read-side critical section to use GFP_ATOMIC.
--- include/linux/lsm_hook_defs.h | 2 +- include/linux/security.h | 5 +++-- kernel/auditfilter.c | 5 +++-- security/apparmor/audit.c | 6 +++--- security/apparmor/include/audit.h | 2 +- security/integrity/ima/ima.h | 2 +- security/integrity/ima/ima_policy.c | 15 +++++++++------ security/security.c | 6 ++++-- security/selinux/include/audit.h | 4 +++- security/selinux/ss/services.c | 5 +++-- security/smack/smack_lsm.c | 4 +++- 11 files changed, 34 insertions(+), 22 deletions(-)
include/linux/lsm_hook_defs.h +1 -1
@@ -370,7 +370,7 @@ LSM_HOOK(int, 0, key_getsecurity, struct#ifdef CONFIG_AUDIT LSM_HOOK(int, 0, audit_rule_init, u32 field, u32 op, char *rulestr, - void **lsmrule) + void **lsmrule, gfp_t gfp) LSM_HOOK(int, 0, audit_rule_known, struct audit_krule *krule) LSM_HOOK(int, 0, audit_rule_match, u32 secid, u32 field, u32 op, void *lsmrule)LSM_HOOK (void,LSM_RET_VOID , audit_rule_free, void *lsmrule)
include/linux/security.h +3 -2
@@ -1856,7 +1856,8 @@ static inline int security_key_getsecuri#ifdef CONFIG_AUDIT #ifdef CONFIG_SECURITY -int security_audit_rule_init (u32 field,u32 op,char *rulestr,void **lsmrule); +int security_audit_rule_init (u32 field,u32 op,char *rulestr,void **lsmrule, +gfp_t gfp);int security_audit_rule_known (struct audit_krule *krule);int security_audit_rule_match (u32 secid,u32 field,u32 op,void *lsmrule);void security_audit_rule_free (void *lsmrule);
@@ -1864,7 +1865,7 @@ void security_audit_rule_free(void *lsmr#else static inline int security_audit_rule_init (u32 field,u32 op,char *rulestr, -void **lsmrule) +void **lsmrule,gfp_t gfp) {return 0 ; }
kernel/auditfilter.c +3 -2
@@ -521,7 +521,8 @@ static struct audit_entry *audit_data_to entry->rule.buflen += f_val; f->lsm_str = str; err =security_audit_rule_init (f->type, f->op, str, - (void **)&f->lsm_rule); + (void **)&f->lsm_rule, +GFP_KERNEL );/* Keep currently invalid fields around in case they * become valid after a policy reload. */ if (err == -EINVAL ) {
@@ -790,7 +791,7 @@ static inline int audit_dupe_lsm_field(s/* our own (refreshed) copy of lsm_rule */ ret =security_audit_rule_init (df->type, df->op, df->lsm_str, - (void **)&df->lsm_rule); + (void **)&df->lsm_rule,GFP_KERNEL );/* Keep currently invalid fields around in case they * become valid after a policy reload. */ if (ret == -EINVAL ) {
security/apparmor/audit.c +3 -3
@@ -173,7 +173,7 @@ void aa_audit_rule_free(void *vrule) } } -int aa_audit_rule_init (u32 field,u32 op,char *rulestr,void **vrule) +int aa_audit_rule_init (u32 field,u32 op,char *rulestr,void **vrule,gfp_t gfp) {struct aa_audit_rule *rule;
@@ -186,14 +186,14 @@ int aa_audit_rule_init(u32 field, u32 opreturn -EINVAL ; } - rule =kzalloc (sizeof (struct aa_audit_rule ),GFP_KERNEL ); + rule =kzalloc (sizeof (struct aa_audit_rule ), gfp);if (!rule)return -ENOMEM ;/* Currently rules are treated as coming from the root ns */ rule->label =aa_label_parse (&root_ns->unconfined->label, rulestr, -GFP_KERNEL , true, false); + gfp, true, false);if (IS_ERR (rule->label)) {int err =PTR_ERR (rule->label);aa_audit_rule_free (rule);
security/apparmor/include/audit.h +1 -1
@@ -186,7 +186,7 @@ static inline int complain_error(int err }void aa_audit_rule_free (void *vrule); -int aa_audit_rule_init (u32 field,u32 op,char *rulestr,void **vrule); +int aa_audit_rule_init (u32 field,u32 op,char *rulestr,void **vrule,gfp_t gfp);int aa_audit_rule_known (struct audit_krule *rule);int aa_audit_rule_match (u32 sid,u32 field,u32 op,void *vrule);
security/integrity/ima/ima.h +1 -1
@@ -420,7 +420,7 @@ static inline void ima_free_modsig(struc#else static inline int ima_filter_rule_init (u32 field,u32 op,char *rulestr, -void **lsmrule) +void **lsmrule,gfp_t gfp) {return -EINVAL ; }
security/integrity/ima/ima_policy.c +9 -6
@@ -349,7 +349,8 @@ static void ima_free_rule(struct ima_rulkfree (entry); } -static struct ima_rule_entry *ima_lsm_copy_rule (struct ima_rule_entry *entry) +static struct ima_rule_entry *ima_lsm_copy_rule (struct ima_rule_entry *entry, +gfp_t gfp) {struct ima_rule_entry *nentry;int i;
@@ -358,7 +359,7 @@ static struct ima_rule_entry *ima_lsm_co* Immutable elements are copied over as pointers and data; only * lsm rules can change */ - nentry =kmemdup (entry,sizeof (*nentry),GFP_KERNEL ); + nentry =kmemdup (entry,sizeof (*nentry), gfp);if (!nentry)return NULL ;
@@ -373,7 +374,8 @@ static struct ima_rule_entry *ima_lsm_coima_filter_rule_init (nentry->lsm[i].type, Audit_equal, nentry->lsm[i].args_p, - &nentry->lsm[i].rule); + &nentry->lsm[i].rule, + gfp);if (!nentry->lsm[i].rule)pr_warn ("rule for LSM \'%s\' is undefined\n" , nentry->lsm[i].args_p);
@@ -386,7 +388,7 @@ static int ima_lsm_update_rule(struct imint i;struct ima_rule_entry *nentry; - nentry =ima_lsm_copy_rule (entry); + nentry =ima_lsm_copy_rule (entry,GFP_KERNEL );if (!nentry)return -ENOMEM ;
@@ -573,7 +575,7 @@ retry: }if (rc == -ESTALE && !rule_reinitialized) { - lsm_rule =ima_lsm_copy_rule (rule); + lsm_rule =ima_lsm_copy_rule (rule,GFP_ATOMIC );if (lsm_rule) { rule_reinitialized = true; goto retry;
@@ -990,7 +992,8 @@ static int ima_lsm_rule_init(struct ima_ entry->lsm[lsm_rule].type = audit_type; result =ima_filter_rule_init (entry->lsm[lsm_rule].type, Audit_equal, entry->lsm[lsm_rule].args_p, - &entry->lsm[lsm_rule].rule); + &entry->lsm[lsm_rule].rule, +GFP_KERNEL );if (!entry->lsm[lsm_rule].rule) {pr_warn ("rule for LSM \'%s\' is undefined\n" , entry->lsm[lsm_rule].args_p);
security/security.c +4 -2
@@ -2545,9 +2545,11 @@ int security_key_getsecurity(struct key#ifdef CONFIG_AUDIT -int security_audit_rule_init (u32 field,u32 op,char *rulestr,void **lsmrule) +int security_audit_rule_init (u32 field,u32 op,char *rulestr,void **lsmrule, +gfp_t gfp) { -return call_int_hook (audit_rule_init,0 , field, op, rulestr, lsmrule); +return call_int_hook (audit_rule_init,0 , field, op, rulestr, lsmrule, + gfp); }int security_audit_rule_known (struct audit_krule *krule)
security/selinux/include/audit.h +3 -1
@@ -18,12 +18,14 @@* @op: the operater the rule uses * @rulestr: the text "target" of the rule * @rule: pointer to the new rule structure returned via this +* @gfp: GFP flag used for kmalloc * * Returns 0 if successful, -errno if not. On success, the rule structure * will be allocated internally. The caller must free this structure with * selinux_audit_rule_free() after use. */ -int selinux_audit_rule_init (u32 field,u32 op,char *rulestr,void **rule); +int selinux_audit_rule_init (u32 field,u32 op,char *rulestr,void **rule, +gfp_t gfp);/** * selinux_audit_rule_free - free an selinux audit rule structure.
security/selinux/ss/services.c +3 -2
@@ -3542,7 +3542,8 @@ void selinux_audit_rule_free(void *vrule } } -int selinux_audit_rule_init (u32 field,u32 op,char *rulestr,void **vrule) +int selinux_audit_rule_init (u32 field,u32 op,char *rulestr,void **vrule, +gfp_t gfp) {struct selinux_state *state = &selinux_state;struct selinux_policy *policy;
@@ -3583,7 +3584,7 @@ int selinux_audit_rule_init(u32 field, ureturn -EINVAL ; } - tmprule =kzalloc (sizeof (struct selinux_audit_rule ),GFP_KERNEL ); + tmprule =kzalloc (sizeof (struct selinux_audit_rule ), gfp);if (!tmprule)return -ENOMEM ;
security/smack/smack_lsm.c +3 -1
@@ -4490,11 +4490,13 @@ static int smack_post_notification(const* @op: required testing operator (=, !=, >, <, ...) * @rulestr: smack label to be audited * @vrule: pointer to save our own audit rule representation +* @gfp: type of the memory for the allocation * * Prepare to audit cases where (@field @op @rulestr) is true. * The label to be audited is created if necessay. */ -static int smack_audit_rule_init (u32 field,u32 op,char *rulestr,void **vrule) +static int smack_audit_rule_init (u32 field,u32 op,char *rulestr,void **vrule, +gfp_t gfp) {struct smack_known *skp;char **rule = (char **)vrule;
Greg Kroah-Hartman
maintainerPATCH 48/108 media: dw2102: fix a potential buffer overflow
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit 1c73d0b29d04bf4082e7beb6a508895e118ee30d upstream.
As pointed by smatch:
drivers/media/usb/dvb-usb/dw2102.c:802 su3000_i2c_transfer() error: __builtin_memcpy() '&state->data[4]' too small (64 vs 67)
That seemss to be due to a wrong copy-and-paste.
--- drivers/media/usb/dvb-usb/dw2102.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/dvb-usb/dw2102.c +1 -1
@@ -786,7 +786,7 @@ static int su3000_i2c_transfer(struct i2if (msg[j].flags &I2C_M_RD ) {/* single read */ -if (1 + msg[j].len >sizeof (state->data)) { +if (4 + msg[j].len >sizeof (state->data)) {warn ("i2c rd: len=%d is too big!\n" , msg[j].len); num = -EOPNOTSUPP ;break ;
Greg Kroah-Hartman
maintainerPATCH 31/108 selftests: fix OOM in msg_zerocopy selftest
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijian Zhang <[email protected]>
[ Upstream commit af2b7e5b741aaae9ffbba2c660def434e07aa241 ]
In selftests/net/msg_zerocopy.c, it has a while loop keeps calling sendmsg on a socket with MSG_ZEROCOPY flag, and it will recv the notifications until the socket is not writable. Typically, it will start the receiving process after around 30+ sendmsgs. However, as the introduction of commit dfa2f0483360 ("tcp: get rid of sysctl_tcp_adv_win_scale"), the sender is always writable and does not get any chance to run recv notifications. The selftest always exits with OUT_OF_MEMORY because the memory used by opt_skb exceeds the net.core.optmem_max. Meanwhile, it could be set to a different value to trigger OOM on older kernels too.
Thus, we introduce "cfg_notification_limit" to force sender to receive notifications after some number of sendmsgs.
--- tools/testing/selftests/net/msg_zerocopy.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
tools/testing/selftests/net/msg_zerocopy.c +11 -1
@@ -85,6 +85,7 @@ static bool cfg_rx;static int cfg_runtime_ms =4200 ;static int cfg_verbose;static int cfg_waittime_ms =500 ; +static int cfg_notification_limit =32 ;static bool cfg_zerocopy;static socklen_t cfg_alen;
@@ -95,6 +96,7 @@ static char payload[IP_MAXPACKET];static long packets, bytes, completions, expected_completions;static int zerocopied =-1 ;static uint32_t next_completion; +static uint32_t sends_since_notify;static unsigned long gettimeofday_ms (void ) {
@@ -208,6 +210,7 @@ static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy, int domain)error (1 , errno,"send" );if (cfg_verbose && ret != len)fprintf (stderr,"send: ret=%u != %u\n" , ret, len); + sends_since_notify++;if (len) { packets++;
@@ -460,6 +463,7 @@ static bool do_recv_completion(int fd, int domain)static void do_recv_completions (int fd,int domain) {while (do_recv_completion (fd, domain)) {} + sends_since_notify =0 ; }/* Wait for all remaining completions on the errqueue */
@@ -549,6 +553,9 @@ static void do_tx(int domain, int type, int protocol)else do_sendmsg (fd, &msg, cfg_zerocopy, domain); +if (cfg_zerocopy && sends_since_notify >= cfg_notification_limit) +do_recv_completions (fd, domain); +while (!do_poll (fd,POLLOUT )) {if (cfg_zerocopy)do_recv_completions (fd, domain);
@@ -708,7 +715,7 @@ static void parse_opts(int argc, char **argv) cfg_payload_len = max_payload_len; -while ((c =getopt (argc, argv,"46c:C:D:i:mp:rs:S:t:vz" )) !=-1 ) { +while ((c =getopt (argc, argv,"46c:C:D:i:l:mp:rs:S:t:vz" )) !=-1 ) {switch (c) {case '4' :if (cfg_family !=PF_UNSPEC )
@@ -736,6 +743,9 @@ static void parse_opts(int argc, char **argv)if (cfg_ifindex ==0 )error (1 , errno,"invalid iface: %s" , optarg);break ; +case 'l' : + cfg_notification_limit =strtoul (optarg,NULL ,0 ); +break ;case 'm' : cfg_cork_mixed = true;break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 49/108 i2c: pnx: Fix potential deadlock warning from del_timer_sync() call in isr
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Piotr Wojtaszczyk <[email protected]>
[ Upstream commit f63b94be6942ba82c55343e196bd09b53227618e ]
When del_timer_sync() is called in an interrupt context it throws a warning because of potential deadlock. The timer is used only to exit from wait_for_completion() after a timeout so replacing the call with wait_for_completion_timeout() allows to remove the problematic timer and its related functions altogether.
--- drivers/i2c/busses/i2c-pnx.c | 48 ++++++++---------------------------- 1 file changed, 10 insertions(+), 38 deletions(-)
drivers/i2c/busses/i2c-pnx.c +10 -38
@@ -15,7 +15,6 @@#include <linux/ioport.h> #include <linux/delay.h> #include <linux/i2c.h> -#include <linux/timer.h> #include <linux/completion.h> #include <linux/platform_device.h> #include <linux/io.h>
@@ -32,7 +31,6 @@ struct i2c_pnx_mif {int ret;/* Return value */ int mode;/* Interface mode */ struct completion complete;/* I/O completion */ -struct timer_list timer;/* Timeout */ u8 * buf;/* Data buffer */ int len;/* Length of data buffer */ int order;/* RX Bytes to order via TX */
@@ -117,24 +115,6 @@ static inline int wait_reset(struct i2c_pnx_algo_data *data)return (timeout <=0 ); } -static inline void i2c_pnx_arm_timer (struct i2c_pnx_algo_data *alg_data) -{ -struct timer_list *timer = &alg_data->mif.timer; -unsigned long expires =msecs_to_jiffies (alg_data->timeout); - -if (expires <=1 ) - expires =2 ; - -del_timer_sync (timer); - -dev_dbg (&alg_data->adapter.dev,"Timer armed at %lu plus %lu jiffies.\n" , - jiffies, expires); - - timer->expires = jiffies + expires; - -add_timer (timer); -} -/** * i2c_pnx_start - start a device * @slave_addr: slave address
@@ -259,8 +239,6 @@ static int i2c_pnx_master_xmit(struct i2c_pnx_algo_data *alg_data) ~(mcntrl_afie | mcntrl_naie | mcntrl_drmie), I2C_REG_CTL(alg_data)); -del_timer_sync (&alg_data->mif.timer); -dev_dbg (&alg_data->adapter.dev,"%s(): Waking up xfer routine.\n" , __func__);
@@ -276,8 +254,6 @@ static int i2c_pnx_master_xmit(struct i2c_pnx_algo_data *alg_data) ~(mcntrl_afie | mcntrl_naie | mcntrl_drmie), I2C_REG_CTL(alg_data)); -/* Stop timer. */ -del_timer_sync (&alg_data->mif.timer);dev_dbg (&alg_data->adapter.dev,"%s(): Waking up xfer routine after zero-xfer.\n" , __func__);
@@ -364,8 +340,6 @@ static int i2c_pnx_master_rcv(struct i2c_pnx_algo_data *alg_data) mcntrl_drmie | mcntrl_daie);iowrite32 (ctl,I2C_REG_CTL (alg_data)); -/* Kill timer. */ -del_timer_sync (&alg_data->mif.timer);complete (&alg_data->mif.complete); } }
@@ -400,8 +374,6 @@ static irqreturn_t i2c_pnx_interrupt(int irq, void *dev_id) mcntrl_drmie);iowrite32 (ctl,I2C_REG_CTL (alg_data)); -/* Stop timer, to prevent timeout. */ -del_timer_sync (&alg_data->mif.timer);complete (&alg_data->mif.complete); }else if (stat & mstatus_nai) {/* Slave did not acknowledge, generate a STOP */
@@ -419,8 +391,6 @@ static irqreturn_t i2c_pnx_interrupt(int irq, void *dev_id)/* Our return value. */ alg_data->mif.ret = -EIO ; -/* Stop timer, to prevent timeout. */ -del_timer_sync (&alg_data->mif.timer);complete (&alg_data->mif.complete); }else {/*
@@ -453,9 +423,8 @@ static irqreturn_t i2c_pnx_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static void i2c_pnx_timeout (struct timer_list *t) +static void i2c_pnx_timeout (struct i2c_pnx_algo_data *alg_data) { -struct i2c_pnx_algo_data *alg_data =from_timer (alg_data, t, mif.timer);u32 ctl; dev_err(&alg_data->adapter.dev,
@@ -472,7 +441,6 @@ static void i2c_pnx_timeout(struct timer_list *t)iowrite32 (ctl,I2C_REG_CTL (alg_data));wait_reset (alg_data); alg_data->mif.ret = -EIO ; -complete (&alg_data->mif.complete); }static inline void bus_reset_if_active (struct i2c_pnx_algo_data *alg_data)
@@ -514,6 +482,7 @@ i2c_pnx_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)struct i2c_msg *pmsg;int rc =0 , completed =0 , i;struct i2c_pnx_algo_data *alg_data = adap->algo_data; +unsigned long time_left;u32 stat; dev_dbg(&alg_data->adapter.dev,
@@ -548,7 +517,6 @@ i2c_pnx_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)dev_dbg (&alg_data->adapter.dev,"%s(): mode %d, %d bytes\n" , __func__, alg_data->mif.mode, alg_data->mif.len); -i2c_pnx_arm_timer (alg_data);/* initialize the completion var */ init_completion (&alg_data->mif.complete);
@@ -564,7 +532,10 @@ i2c_pnx_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)break ;/* Wait for completion */ -wait_for_completion (&alg_data->mif.complete); + time_left =wait_for_completion_timeout (&alg_data->mif.complete, + alg_data->timeout); +if (time_left ==0 ) +i2c_pnx_timeout (alg_data);if (!(rc = alg_data->mif.ret)) completed++;
@@ -657,7 +628,10 @@ static int i2c_pnx_probe(struct platform_device *pdev) alg_data->adapter.algo_data = alg_data; alg_data->adapter.nr = pdev->id; - alg_data->timeout =I2C_PNX_TIMEOUT_DEFAULT ; + alg_data->timeout =msecs_to_jiffies (I2C_PNX_TIMEOUT_DEFAULT ); +if (alg_data->timeout <=1 ) + alg_data->timeout =2 ; +#ifdef CONFIG_OF alg_data->adapter.dev.of_node =of_node_get (pdev->dev.of_node);if (pdev->dev.of_node) {
@@ -677,8 +651,6 @@ static int i2c_pnx_probe(struct platform_device *pdev)if (IS_ERR (alg_data->clk))return PTR_ERR (alg_data->clk); -timer_setup (&alg_data->mif.timer, i2c_pnx_timeout,0 ); -snprintf (alg_data->adapter.name,sizeof (alg_data->adapter.name),"%s" , pdev->name);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 50/108 ALSA: hda/realtek: Enable headset mic of JP-IK LEAP W502 with ALC897
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian-Hong Pan <[email protected]>
[ Upstream commit 45e37f9ce28d248470bab4376df2687a215d1b22 ]
JP-IK LEAP W502 laptop's headset mic is not enabled until ALC897_FIXUP_HEADSET_MIC_PIN3 quirk is applied.
Here is the original pin node values:
0x11 0x400000000x12 0xb7a601300x14 0x901701100x15 0x411111f00x16 0x411111f00x17 0x411111f00x18 0x411111f00x19 0x411111f00x1a 0x411111f00x1b 0x032110200x1c 0x411111f00x1d 0x4026892d0x1e 0x411111f00x1f 0x411111f0
--- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/pci/hda/patch_realtek.c +9 -0
@@ -10807,6 +10807,7 @@ enum {ALC897_FIXUP_LENOVO_HEADSET_MODE ,ALC897_FIXUP_HEADSET_MIC_PIN2 ,ALC897_FIXUP_UNIS_H3C_X500S , + ALC897_FIXUP_HEADSET_MIC_PIN3, }; static const struct hda_fixup alc662_fixups[] = {
@@ -11253,10 +11254,18 @@ static const struct hda_fixup alc662_fixups[] = { {} }, }, + [ALC897_FIXUP_HEADSET_MIC_PIN3 ] = { + .type =HDA_FIXUP_PINS , + .v.pins = (const struct hda_pintbl []) { + {0x19 ,0x03a11050 },/* use as headset mic */ + { } + }, + }, };static const struct snd_pci_quirk alc662_fixup_tbl[] = {SND_PCI_QUIRK (0x1019 ,0x9087 ,"ECS" ,ALC662_FIXUP_ASUS_MODE2 ), +SND_PCI_QUIRK (0x1019 ,0x9859 ,"JP-IK LEAP W502" ,ALC897_FIXUP_HEADSET_MIC_PIN3 ),SND_PCI_QUIRK (0x1025 ,0x022f ,"Acer Aspire One" ,ALC662_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x1025 ,0x0241 ,"Packard Bell DOTS" ,ALC662_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x1025 ,0x0308 ,"Acer Aspire 8942G" ,ALC662_FIXUP_ASPIRE ),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 51/108 nvme-multipath: find NUMA path only for online numa-node
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nilay Shroff <[email protected]>
[ Upstream commit d3a043733f25d743f3aa617c7f82dbcb5ee2211a ]
In current native multipath design when a shared namespace is created, we loop through each possible numa-node, calculate the NUMA distance of that node from each nvme controller and then cache the optimal IO path for future reference while sending IO. The issue with this design is that we may refer to the NUMA distance table for an offline node which may not be populated at the time and so we may inadvertently end up finding and caching a non-optimal path for IO. Then latter when the corresponding numa-node becomes online and hence the NUMA distance table entry for that node is created, ideally we should re-calculate the multipath node distance for the newly added node however that doesn't happen unless we rescan/reset the controller. So essentially, we may keep using non-optimal IO path for a node which is made online after namespace is created.
This patch helps fix this issue ensuring that when a shared namespace is created, we calculate the multipath node distance for each online numa-node instead of each possible numa-node. Then latter when a node becomes online and we receive any IO on that newly added node, we would calculate the multipath node distance for newly added node but this time NUMA distance table would have been already populated for newly added node. Hence we would be able to correctly calculate the multipath node distance and choose the optimal path for the IO.
--- drivers/nvme/host/multipath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/multipath.c +1 -1
@@ -420,7 +420,7 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)int node, srcu_idx; srcu_idx =srcu_read_lock (&head->srcu); -for_each_node (node) +for_each_online_node (node)__nvme_find_path (head, node);srcu_read_unlock (&head->srcu, srcu_idx); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 52/108 nvme: adjust multiples of NVME_CTRL_PAGE_SIZE in offset
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kundan Kumar <[email protected]>
[ Upstream commit 1bd293fcf3af84674e82ed022c049491f3768840 ]
bio_vec start offset may be relatively large particularly when large folio gets added to the bio. A bigger offset will result in avoiding the single-segment mapping optimization and end up using expensive mempool_alloc further.
Rather than using absolute value, adjust bv_offset by NVME_CTRL_PAGE_SIZE while checking if segment can be fitted into one/two PRP entries.
--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
@@ -844,7 +844,8 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,struct bio_vec bv =req_bvec (req);if (!is_pci_p2pdma_page (bv.bv_page)) { -if (bv.bv_offset + bv.bv_len <=NVME_CTRL_PAGE_SIZE *2 ) +if ((bv.bv_offset & (NVME_CTRL_PAGE_SIZE -1 )) + + bv.bv_len <=NVME_CTRL_PAGE_SIZE *2 )return nvme_setup_prp_simple (dev, req, &cmnd->rw, &bv);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 53/108 platform/x86: touchscreen_dmi: Add info for GlobalSpace SolT IVW 11.6" tablet
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: hmtheboy154 <[email protected]>
[ Upstream commit 7c8639aa41343fd7b3dbe09baf6b0791fcc407a1 ]
This is a tablet created by GlobalSpace Technologies Limited which uses an Intel Atom x5-Z8300, 4GB of RAM & 64GB of storage.
--- drivers/platform/x86/touchscreen_dmi.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/platform/x86/touchscreen_dmi.c +25 -0
@@ -857,6 +857,22 @@ static const struct ts_dmi_data schneider_sct101ctm_data = { .properties = schneider_sct101ctm_props, }; +static const struct property_entry globalspace_solt_ivw116_props[] = { +PROPERTY_ENTRY_U32 ("touchscreen-min-x" ,7 ), +PROPERTY_ENTRY_U32 ("touchscreen-min-y" ,22 ), +PROPERTY_ENTRY_U32 ("touchscreen-size-x" ,1723 ), +PROPERTY_ENTRY_U32 ("touchscreen-size-y" ,1077 ), +PROPERTY_ENTRY_STRING ("firmware-name" ,"gsl1680-globalspace-solt-ivw116.fw" ), +PROPERTY_ENTRY_U32 ("silead,max-fingers" ,10 ), +PROPERTY_ENTRY_BOOL ("silead,home-button" ), + { } +}; + +static const struct ts_dmi_data globalspace_solt_ivw116_data = { + .acpi_name ="MSSL1680:00" , + .properties = globalspace_solt_ivw116_props, +}; +static const struct property_entry techbite_arc_11_6_props[] = {PROPERTY_ENTRY_U32 ("touchscreen-min-x" ,5 ),PROPERTY_ENTRY_U32 ("touchscreen-min-y" ,7 ),
@@ -1490,6 +1506,15 @@ const struct dmi_system_id touchscreen_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "SCT101CTM"), }, }, + { +/* GlobalSpace SoLT IVW 11.6" */ + .driver_data = (void *)&globalspace_solt_ivw116_data, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Globalspace Tech Pvt Ltd" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"SolTIVW" ), + DMI_MATCH(DMI_PRODUCT_SKU, "PN20170413488"), + }, + }, {/* Techbite Arc 11.6 */ .driver_data = (void *)&techbite_arc_11_6_data,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 54/108 platform/x86: touchscreen_dmi: Add info for the EZpad 6s Pro
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: hmtheboy154 <[email protected]>
[ Upstream commit 3050052613790e75b5e4a8536930426b0a8b0774 ]
The "EZpad 6s Pro" uses the same touchscreen as the "EZpad 6 Pro B", unlike the "Ezpad 6 Pro" which has its own touchscreen.
--- drivers/platform/x86/touchscreen_dmi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/platform/x86/touchscreen_dmi.c +11 -0
@@ -1277,6 +1277,17 @@ const struct dmi_system_id touchscreen_dmi_table[] = { DMI_MATCH(DMI_BIOS_DATE, "04/24/2018"), }, }, + { +/* Jumper EZpad 6s Pro */ + .driver_data = (void *)&jumper_ezpad_6_pro_b_data, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Jumper" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Ezpad" ), +/* Above matches are too generic, add bios match */ +DMI_MATCH (DMI_BIOS_VERSION ,"E.WSA116_8.E1.042.bin" ), + DMI_MATCH(DMI_BIOS_DATE, "01/08/2020"), + }, + }, {/* Jumper EZpad 6 m4 */ .driver_data = (void *)&jumper_ezpad_6_m4_data,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/108 nvmet: fix a possible leak when destroy a ctrl during qp establishment
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagi Grimberg <[email protected]>
[ Upstream commit c758b77d4a0a0ed3a1292b3fd7a2aeccd1a169a4 ]
In nvmet_sq_destroy we capture sq->ctrl early and if it is non-NULL we know that a ctrl was allocated (in the admin connect request handler) and we need to release pending AERs, clear ctrl->sqs and sq->ctrl (for nvme-loop primarily), and drop the final reference on the ctrl.
However, a small window is possible where nvmet_sq_destroy starts (as a result of the client giving up and disconnecting) concurrently with the nvme admin connect cmd (which may be in an early stage). But *before* kill_and_confirm of sq->ref (i.e. the admin connect managed to get an sq live reference). In this case, sq->ctrl was allocated however after it was captured in a local variable in nvmet_sq_destroy.
This prevented the final reference drop on the ctrl.
Solve this by re-capturing the sq->ctrl after all inflight request has completed, where for sure sq->ctrl reference is final, and move forward based on that.
This issue was observed in an environment with many hosts connecting multiple ctrls simoutanuosly, creating a delay in allocating a ctrl leading up to this race window.
--- drivers/nvme/target/core.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/nvme/target/core.c +9 -0
@@ -795,6 +795,15 @@ void nvmet_sq_destroy(struct nvmet_sq *sq)wait_for_completion (&sq->free_done);percpu_ref_exit (&sq->ref); +/* +* we must reference the ctrl again after waiting for inflight IO +* to complete. Because admin connect may have sneaked in after we +* store sq->ctrl locally, but before we killed the percpu_ref. the +* admin connect allocates and assigns sq->ctrl, which now needs a +* final ref put, as this ctrl is going away. +*/ + ctrl = sq->ctrl; +if (ctrl) {/* * The teardown flow may take some time, and the host may not
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/108 kbuild: fix short log for AS in link-vmlinux.sh
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 3430f65d6130ccbc86f0ff45642eeb9e2032a600 ]
In convention, short logs print the output file, not the input file.
Let's change the suffix for 'AS' since it assembles *.S into *.o.
[Before]
LD .tmp_vmlinux.kallsyms1 NM .tmp_vmlinux.kallsyms1.syms KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.S LD .tmp_vmlinux.kallsyms2 NM .tmp_vmlinux.kallsyms2.syms KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.S LD vmlinux
[After]
LD .tmp_vmlinux.kallsyms1 NM .tmp_vmlinux.kallsyms1.syms KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.o LD .tmp_vmlinux.kallsyms2 NM .tmp_vmlinux.kallsyms2.syms KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.o LD vmlinux
--- scripts/link-vmlinux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/link-vmlinux.sh +1 -1
@@ -213,7 +213,7 @@ kallsyms_step() vmlinux_link ${kallsyms_vmlinux} "${kallsymso_prev}" ${btf_vmlinux_bin_o} kallsyms ${kallsyms_vmlinux} ${kallsyms_S} - info AS ${kallsyms_S} + info AS ${kallsymso} ${CC} ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS} \ ${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ -c -o ${kallsymso} ${kallsyms_S}
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/108 nilfs2: fix incorrect inode allocation from reserved inodes
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 93aef9eda1cea9e84ab2453fcceb8addad0e46f1 upstream.
If the bitmap block that manages the inode allocation status is corrupted, nilfs_ifile_create_inode() may allocate a new inode from the reserved inode area where it should not be allocated.
Previous fix commit d325dc6eb763 ("nilfs2: fix use-after-free bug of struct nilfs_root"), fixed the problem that reserved inodes with inode numbers less than NILFS_USER_INO (=11) were incorrectly reallocated due to bitmap corruption, but since the start number of non-reserved inodes is read from the super block and may change, in which case inode allocation may occur from the extended reserved inode area.
If that happens, access to that inode will cause an IO error, causing the file system to degrade to an error state.
Fix this potential issue by adding a wraparound option to the common metadata object allocation routine and by modifying nilfs_ifile_create_inode() to disable the option so that it only allocates inodes with inode numbers greater than or equal to the inode number read in "nilfs->ns_first_ino", regardless of the bitmap status of reserved inodes.
--- fs/nilfs2/alloc.c | 18 ++++++++++++++---- fs/nilfs2/alloc.h | 4 ++-- fs/nilfs2/dat.c | 2 +- fs/nilfs2/ifile.c | 7 ++----- 4 files changed, 19 insertions(+), 12 deletions(-)
fs/nilfs2/alloc.c +14 -4
@@ -377,11 +377,12 @@ void *nilfs_palloc_block_get_entry(const* @target: offset number of an entry in the group (start point) * @bsize: size in bits * @lock: spin lock protecting @bitmap +* @wrap: whether to wrap around */ static int nilfs_palloc_find_available_slot (unsigned char *bitmap,unsigned long target,unsigned int bsize, -spinlock_t *lock) +spinlock_t *lock,bool wrap) {int pos, end = bsize;
@@ -397,6 +398,8 @@ static int nilfs_palloc_find_available_s end = target; } +if (!wrap) +return -ENOSPC ;/* wrap around */ for (pos =0 ; pos < end; pos++) {
@@ -495,9 +498,10 @@ int nilfs_palloc_count_max_entries(struc* nilfs_palloc_prepare_alloc_entry - prepare to allocate a persistent object * @inode: inode of metadata file using this allocator * @req: nilfs_palloc_req structure exchanged for the allocation +* @wrap: whether to wrap around */ int nilfs_palloc_prepare_alloc_entry (struct inode *inode, -struct nilfs_palloc_req *req) +struct nilfs_palloc_req *req,bool wrap) {struct buffer_head *desc_bh, *bitmap_bh;struct nilfs_palloc_group_desc *desc;
@@ -516,7 +520,7 @@ int nilfs_palloc_prepare_alloc_entry(str entries_per_group =nilfs_palloc_entries_per_group (inode);for (i =0 ; i < ngroups; i += n) { -if (group >= ngroups) { +if (group >= ngroups && wrap) {/* wrap around */ group =0 ; maxgroup = nilfs_palloc_group(inode, req->pr_entry_nr,
@@ -541,7 +545,13 @@ int nilfs_palloc_prepare_alloc_entry(str bitmap = bitmap_kaddr +bh_offset (bitmap_bh); pos =nilfs_palloc_find_available_slot ( bitmap, group_offset, - entries_per_group, lock); + entries_per_group, lock, wrap); +/* +* Since the search for a free slot in the +* second and subsequent bitmap blocks always +* starts from the beginning, the wrap flag +* only has an effect on the first search. +*/ if (pos >=0 ) {/* found a free entry */ nilfs_palloc_group_desc_add_entries(
fs/nilfs2/alloc.h +2 -2
@@ -50,8 +50,8 @@ struct nilfs_palloc_req {struct buffer_head *pr_entry_bh; }; -int nilfs_palloc_prepare_alloc_entry (struct inode *, -struct nilfs_palloc_req *); +int nilfs_palloc_prepare_alloc_entry (struct inode *inode, +struct nilfs_palloc_req *req,bool wrap);void nilfs_palloc_commit_alloc_entry (struct inode *,struct nilfs_palloc_req *);void nilfs_palloc_abort_alloc_entry (struct inode *,struct nilfs_palloc_req *);
fs/nilfs2/dat.c +1 -1
@@ -75,7 +75,7 @@ int nilfs_dat_prepare_alloc(struct inode {int ret; - ret =nilfs_palloc_prepare_alloc_entry (dat, req); + ret =nilfs_palloc_prepare_alloc_entry (dat, req, true);if (ret <0 )return ret;
fs/nilfs2/ifile.c +2 -5
@@ -55,13 +55,10 @@ int nilfs_ifile_create_inode(struct inodstruct nilfs_palloc_req req;int ret; - req.pr_entry_nr =0 ;/* -* 0 says find free inode from beginning -* of a group. dull code!! -*/ + req.pr_entry_nr =NILFS_FIRST_INO (ifile->i_sb); req.pr_entry_bh =NULL ; - ret =nilfs_palloc_prepare_alloc_entry (ifile, &req); + ret =nilfs_palloc_prepare_alloc_entry (ifile, &req, false);if (!ret) { ret =nilfs_palloc_get_entry_block (ifile, req.pr_entry_nr,1 , &req.pr_entry_bh);
Greg Kroah-Hartman
maintainerPATCH 58/108 mm: prevent derefencing NULL ptr in pfn_section_valid()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Waiman Long <[email protected]>
[ Upstream commit 82f0b6f041fad768c28b4ad05a683065412c226e ]
Commit 5ec8e8ea8b77 ("mm/sparsemem: fix race in accessing memory_section->usage") changed pfn_section_valid() to add a READ_ONCE() call around "ms->usage" to fix a race with section_deactivate() where ms->usage can be cleared. The READ_ONCE() call, by itself, is not enough to prevent NULL pointer dereference. We need to check its value before dereferencing it.
--- include/linux/mmzone.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/mmzone.h +2 -1
@@ -1353,8 +1353,9 @@ static inline int subsection_map_index(unsigned long pfn)static inline int pfn_section_valid (struct mem_section *ms,unsigned long pfn) {int idx =subsection_map_index (pfn); +struct mem_section_usage *usage =READ_ONCE (ms->usage); -return test_bit (idx,READ_ONCE (ms->usage)->subsection_map); +return usage ?test_bit (idx, usage->subsection_map) :0 ; }#else static inline int pfn_section_valid (struct mem_section *ms,unsigned long pfn)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/108 selftests: make order checking verbose in msg_zerocopy selftest
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijian Zhang <[email protected]>
[ Upstream commit 7d6d8f0c8b700c9493f2839abccb6d29028b4219 ]
We find that when lock debugging is on, notifications may not come in order. Thus, we have order checking outputs managed by cfg_verbose, to avoid too many outputs in this case.
--- tools/testing/selftests/net/msg_zerocopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/msg_zerocopy.c +1 -1
@@ -438,7 +438,7 @@ static bool do_recv_completion(int fd, int domain)/* Detect notification gaps. These should not happen often, if at all. * Gaps can occur due to drops, reordering and retransmissions. */ -if (lo != next_completion) +if (cfg_verbose && lo != next_completion)fprintf (stderr,"gap: %u..%u does not append to %u\n" , lo, hi, next_completion); next_completion = hi +1 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/108 filelock: fix potential use-after-free in posix_lock_inode
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
[ Upstream commit 1b3ec4f7c03d4b07bad70697d7e2f4088d2cfe92 ]
Light Hsieh reported a KASAN UAF warning in trace_posix_lock_inode(). The request pointer had been changed earlier to point to a lock entry that was added to the inode's list. However, before the tracepoint could fire, another task raced in and freed that lock.
Fix this by moving the tracepoint inside the spinlock, which should ensure that this doesn't happen.
--- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/locks.c +1 -1
@@ -1392,9 +1392,9 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,locks_wake_up_blocks (left); } out: +trace_posix_lock_inode (inode, request, error);spin_unlock (&ctx->flc_lock);percpu_up_read (&file_rwsem); -trace_posix_lock_inode (inode, request, error);/* * Free any unused locks. */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/108 fs/dcache: Re-use value stored to dentry->d_flags instead of re-reading
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: linke li <[email protected]>
[ Upstream commit 8bfb40be31ddea0cb4664b352e1797cfe6c91976 ]
Currently, the __d_clear_type_and_inode() writes the value flags to dentry->d_flags, then immediately re-reads it in order to use it in a if statement. This re-read is useless because no other update to dentry->d_flags can occur at this point.
This commit therefore re-use flags in the if statement instead of re-reading dentry->d_flags.
Stable-dep-of: aabfe57ebaa7 ("vfs: don't mod negative dentry count when on shrinker list")
--- fs/dcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/dcache.c +1 -1
@@ -329,7 +329,7 @@ static inline void __d_clear_type_and_inode(struct dentry *dentry) flags &= ~(DCACHE_ENTRY_TYPE |DCACHE_FALLTHRU );WRITE_ONCE (dentry->d_flags, flags); dentry->d_inode =NULL ; -if (dentry->d_flags &DCACHE_LRU_LIST ) +if (flags &DCACHE_LRU_LIST )this_cpu_inc (nr_dentry_negative); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/108 vfs: dont mod negative dentry count when on shrinker list
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Foster <[email protected]>
[ Upstream commit aabfe57ebaa75841db47ea59091ec3c5a06d2f52 ]
The nr_dentry_negative counter is intended to only account negative dentries that are present on the superblock LRU. Therefore, the LRU add, remove and isolate helpers modify the counter based on whether the dentry is negative, but the shrinker list related helpers do not modify the counter, and the paths that change a dentry between positive and negative only do so if DCACHE_LRU_LIST is set.
The problem with this is that a dentry on a shrinker list still has DCACHE_LRU_LIST set to indicate ->d_lru is in use. The additional DCACHE_SHRINK_LIST flag denotes whether the dentry is on LRU or a shrink related list. Therefore if a relevant operation (i.e. unlink) occurs while a dentry is present on a shrinker list, and the associated codepath only checks for DCACHE_LRU_LIST, then it is technically possible to modify the negative dentry count for a dentry that is off the LRU. Since the shrinker list related helpers do not modify the negative dentry count (because non-LRU dentries should not be included in the count) when the dentry is ultimately removed from the shrinker list, this can cause the negative dentry count to become permanently inaccurate.
This problem can be reproduced via a heavy file create/unlink vs. drop_caches workload. On an 80xcpu system, I start 80 tasks each running a 1k file create/delete loop, and one task spinning on drop_caches. After 10 minutes or so of runtime, the idle/clean cache negative dentry count increases from somewhere in the range of 5-10 entries to several hundred (and increasingly grows beyond nr_dentry_unused).
Tweak the logic in the paths that turn a dentry negative or positive to filter out the case where the dentry is present on a shrink related list. This allows the above workload to maintain an accurate negative dentry count.
--- fs/dcache.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/dcache.c +9 -3
@@ -329,7 +329,11 @@ static inline void __d_clear_type_and_inode(struct dentry *dentry) flags &= ~(DCACHE_ENTRY_TYPE |DCACHE_FALLTHRU );WRITE_ONCE (dentry->d_flags, flags); dentry->d_inode =NULL ; -if (flags &DCACHE_LRU_LIST ) +/* +* The negative counter only tracks dentries on the LRU. Don't inc if +* d_lru is on another list. +*/ +if ((flags & (DCACHE_LRU_LIST |DCACHE_SHRINK_LIST )) ==DCACHE_LRU_LIST )this_cpu_inc (nr_dentry_negative); }
@@ -1940,9 +1944,11 @@ static void __d_instantiate(struct dentry *dentry, struct inode *inode)spin_lock (&dentry->d_lock);/* -* Decrement negative dentry count if it was in the LRU list. +* The negative counter only tracks dentries on the LRU. Don't dec if +* d_lru is on another list. */ -if (dentry->d_flags &DCACHE_LRU_LIST ) +if ((dentry->d_flags & + (DCACHE_LRU_LIST |DCACHE_SHRINK_LIST )) ==DCACHE_LRU_LIST )this_cpu_dec (nr_dentry_negative);hlist_add_head (&dentry->d_u.d_alias, &inode->i_dentry);raw_write_seqcount_begin (&dentry->d_seq);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/108 tcp: fix incorrect undo caused by DSACK of TLP retransmit
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neal Cardwell <[email protected]>
[ Upstream commit 0ec986ed7bab6801faed1440e8839dcc710331ff ]
Loss recovery undo_retrans bookkeeping had a long-standing bug where a DSACK from a spurious TLP retransmit packet could cause an erroneous undo of a fast recovery or RTO recovery that repaired a single really-lost packet (in a sequence range outside that of the TLP retransmit). Basically, because the loss recovery state machine didn't account for the fact that it sent a TLP retransmit, the DSACK for the TLP retransmit could erroneously be implicitly be interpreted as corresponding to the normal fast recovery or RTO recovery retransmit that plugged a real hole, thus resulting in an improper undo.
For example, consider the following buggy scenario where there is a real packet loss but the congestion control response is improperly undone because of this bug:
+ send packets P1, P2, P3, P4
+ P1 is really lost
+ send TLP retransmit of P4
+ receive SACK for original P2, P3, P4
+ enter fast recovery, fast-retransmit P1, increment undo_retrans to 1
+ receive DSACK for TLP P4, decrement undo_retrans to 0, undo (bug!)
+ receive cumulative ACK for P1-P4 (fast retransmit plugged real hole)
The fix: when we initialize undo machinery in tcp_init_undo(), if there is a TLP retransmit in flight, then increment tp->undo_retrans so that we make sure that we receive a DSACK corresponding to the TLP retransmit, as well as DSACKs for all later normal retransmits, before triggering a loss recovery undo. Note that we also have to move the line that clears tp->tlp_high_seq for RTO recovery, so that upon RTO we remember the tp->tlp_high_seq value until tcp_init_undo() and clear it only afterward.
Also note that the bug dates back to the original 2013 TLP implementation, commit 6ba8a3b19e76 ("tcp: Tail loss probe (TLP)").
However, this patch will only compile and work correctly with kernels that have tp->tlp_retrans, which was added only in v5.8 in 2020 in commit 76be93fc0702 ("tcp: allow at most one TLP probe per flight"). So we associate this fix with that later commit.
--- net/ipv4/tcp_input.c | 11 ++++++++++- net/ipv4/tcp_timer.c | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-)
net/ipv4/tcp_input.c +10 -1
@@ -2084,8 +2084,16 @@ void tcp_clear_retrans(struct tcp_sock *tp)static inline void tcp_init_undo (struct tcp_sock *tp) { tp->undo_marker = tp->snd_una; +/* Retransmission still in flight may cause DSACKs later. */ - tp->undo_retrans = tp->retrans_out ? :-1 ; +/* First, account for regular retransmits in flight: */ + tp->undo_retrans = tp->retrans_out; +/* Next, account for TLP retransmits in flight: */ +if (tp->tlp_high_seq && tp->tlp_retrans) + tp->undo_retrans++; +/* Finally, avoid 0, because undo_retrans==0 means "can undo now": */ +if (!tp->undo_retrans) + tp->undo_retrans =-1 ; }static bool tcp_is_rack (const struct sock *sk)
@@ -2164,6 +2172,7 @@ void tcp_enter_loss(struct sock *sk)tcp_set_ca_state (sk, TCP_CA_Loss); tp->high_seq = tp->snd_nxt; + tp->tlp_high_seq =0 ;tcp_ecn_queue_cwr (tp);/* F-RTO RFC5682 sec 3.1 step 1: retransmit SND.UNA if no previous
net/ipv4/tcp_timer.c +0 -2
@@ -492,8 +492,6 @@ void tcp_retransmit_timer(struct sock *sk)if (WARN_ON_ONCE (!skb))return ; - tp->tlp_high_seq =0 ; -if (!tp->snd_wnd && !sock_flag (sk,SOCK_DEAD ) && !((1 << sk->sk_state) & (TCPF_SYN_SENT |TCPF_SYN_RECV ))) {/* Receiver dastardly shrinks window. Our retransmits
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 33/108 inet_diag: Initialize pad field in struct inet_diag_req_v2
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shigeru Yoshida <[email protected]>
[ Upstream commit 61cf1c739f08190a4cbf047b9fbb192a94d87e3f ]
KMSAN reported uninit-value access in raw_lookup() [1]. Diag for raw sockets uses the pad field in struct inet_diag_req_v2 for the underlying protocol. This field corresponds to the sdiag_raw_protocol field in struct inet_diag_req_raw.
inet_diag_get_exact_compat() converts inet_diag_req to inet_diag_req_v2, but leaves the pad field uninitialized. So the issue occurs when raw_lookup() accesses the sdiag_raw_protocol field.
Fix this by initializing the pad field in inet_diag_get_exact_compat(). Also, do the same fix in inet_diag_dump_compat() to avoid the similar issue in the future.
[1]
BUG: KMSAN: uninit-value in raw_lookup net/ipv4/raw_diag.c:49 [inline] BUG: KMSAN: uninit-value in raw_sock_get+0x657/0x800 net/ipv4/raw_diag.c:71 raw_lookup net/ipv4/raw_diag.c:49 [inline] raw_sock_get+0x657/0x800 net/ipv4/raw_diag.c:71 raw_diag_dump_one+0xa1/0x660 net/ipv4/raw_diag.c:99 inet_diag_cmd_exact+0x7d9/0x980 inet_diag_get_exact_compat net/ipv4/inet_diag.c:1404 [inline] inet_diag_rcv_msg_compat+0x469/0x530 net/ipv4/inet_diag.c:1426 sock_diag_rcv_msg+0x23d/0x740 net/core/sock_diag.c:282 netlink_rcv_skb+0x537/0x670 net/netlink/af_netlink.c:2564 sock_diag_rcv+0x35/0x40 net/core/sock_diag.c:297 netlink_unicast_kernel net/netlink/af_netlink.c:1335 [inline] netlink_unicast+0xe74/0x1240 net/netlink/af_netlink.c:1361 netlink_sendmsg+0x10c6/0x1260 net/netlink/af_netlink.c:1905 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0x332/0x3d0 net/socket.c:745 ____sys_sendmsg+0x7f0/0xb70 net/socket.c:2585 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2639 __sys_sendmsg net/socket.c:2668 [inline] __do_sys_sendmsg net/socket.c:2677 [inline] __se_sys_sendmsg net/socket.c:2675 [inline] __x64_sys_sendmsg+0x27e/0x4a0 net/socket.c:2675 x64_sys_call+0x135e/0x3ce0 arch/x86/include/generated/asm/syscalls_64.h:47 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xd9/0x1e0 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
Uninit was stored to memory at:
raw_sock_get+0x650/0x800 net/ipv4/raw_diag.c:71 raw_diag_dump_one+0xa1/0x660 net/ipv4/raw_diag.c:99 inet_diag_cmd_exact+0x7d9/0x980 inet_diag_get_exact_compat net/ipv4/inet_diag.c:1404 [inline] inet_diag_rcv_msg_compat+0x469/0x530 net/ipv4/inet_diag.c:1426 sock_diag_rcv_msg+0x23d/0x740 net/core/sock_diag.c:282 netlink_rcv_skb+0x537/0x670 net/netlink/af_netlink.c:2564 sock_diag_rcv+0x35/0x40 net/core/sock_diag.c:297 netlink_unicast_kernel net/netlink/af_netlink.c:1335 [inline] netlink_unicast+0xe74/0x1240 net/netlink/af_netlink.c:1361 netlink_sendmsg+0x10c6/0x1260 net/netlink/af_netlink.c:1905 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0x332/0x3d0 net/socket.c:745 ____sys_sendmsg+0x7f0/0xb70 net/socket.c:2585 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2639 __sys_sendmsg net/socket.c:2668 [inline] __do_sys_sendmsg net/socket.c:2677 [inline] __se_sys_sendmsg net/socket.c:2675 [inline] __x64_sys_sendmsg+0x27e/0x4a0 net/socket.c:2675 x64_sys_call+0x135e/0x3ce0 arch/x86/include/generated/asm/syscalls_64.h:47 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xd9/0x1e0 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
Local variable req.i created at:
inet_diag_get_exact_compat net/ipv4/inet_diag.c:1396 [inline] inet_diag_rcv_msg_compat+0x2a6/0x530 net/ipv4/inet_diag.c:1426 sock_diag_rcv_msg+0x23d/0x740 net/core/sock_diag.c:282 CPU: 1 PID: 8888 Comm: syz-executor.6 Not tainted 6.10.0-rc4-00217-g35bb670d65fc #32 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-2.fc40 04/01/2014
--- net/ipv4/inet_diag.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/inet_diag.c +2 -0
@@ -1275,6 +1275,7 @@ static int inet_diag_dump_compat(struct sk_buff *skb, req.sdiag_family =AF_UNSPEC ;/* compatibility */ req.sdiag_protocol =inet_diag_type2proto (cb->nlh->nlmsg_type); req.idiag_ext = rc->idiag_ext; + req.pad =0 ; req.idiag_states = rc->idiag_states; req.id = rc->id;
@@ -1290,6 +1291,7 @@ static int inet_diag_get_exact_compat(struct sk_buff *in_skb, req.sdiag_family = rc->idiag_family; req.sdiag_protocol =inet_diag_type2proto (nlh->nlmsg_type); req.idiag_ext = rc->idiag_ext; + req.pad =0 ; req.idiag_states = rc->idiag_states; req.id = rc->id;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 34/108 nilfs2: fix inode number range checks
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit e2fec219a36e0993642844be0f345513507031f4 upstream.
Patch series "nilfs2: fix potential issues related to reserved inodes".
This series fixes one use-after-free issue reported by syzbot, caused by nilfs2's internal inode being exposed in the namespace on a corrupted filesystem, and a couple of flaws that cause problems if the starting number of non-reserved inodes written in the on-disk super block is intentionally (or corruptly) changed from its default value.
This patch (of 3):
In the current implementation of nilfs2, "nilfs->ns_first_ino", which gives the first non-reserved inode number, is read from the superblock, but its lower limit is not checked.
As a result, if a number that overlaps with the inode number range of reserved inodes such as the root directory or metadata files is set in the super block parameter, the inode number test macros (NILFS_MDT_INODE and NILFS_VALID_INODE) will not function properly.
In addition, these test macros use left bit-shift calculations using with the inode number as the shift count via the BIT macro, but the result of a shift calculation that exceeds the bit width of an integer is undefined in the C specification, so if "ns_first_ino" is set to a large value other than the default value NILFS_USER_INO (=11), the macros may potentially malfunction depending on the environment.
Fix these issues by checking the lower bound of "nilfs->ns_first_ino" and by preventing bit shifts equal to or greater than the NILFS_USER_INO constant in the inode number test macros.
Also, change the type of "ns_first_ino" from signed integer to unsigned integer to avoid the need for type casting in comparisons such as the lower bound check introduced this time.
--- fs/nilfs2/nilfs.h | 5 +++-- fs/nilfs2/the_nilfs.c | 6 ++++++ fs/nilfs2/the_nilfs.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-)
fs/nilfs2/nilfs.h +3 -2
@@ -116,9 +116,10 @@ enum {#define NILFS_FIRST_INO (sb) (((struct the_nilfs *)sb->s_fs_info)->ns_first_ino)#define NILFS_MDT_INODE (sb, ino) \ - ((ino) < NILFS_FIRST_INO(sb) && (NILFS_MDT_INO_BITS & BIT(ino))) + ((ino) < NILFS_USER_INO && (NILFS_MDT_INO_BITS & BIT(ino)))#define NILFS_VALID_INODE (sb, ino) \ - ((ino) >= NILFS_FIRST_INO(sb) || (NILFS_SYS_INO_BITS & BIT(ino))) + ((ino) >= NILFS_FIRST_INO(sb) || \ + ((ino) < NILFS_USER_INO && (NILFS_SYS_INO_BITS & BIT(ino))))/** * struct nilfs_transaction_info: context information for synchronization
fs/nilfs2/the_nilfs.c +6 -0
@@ -452,6 +452,12 @@ static int nilfs_store_disk_layout(struc } nilfs->ns_first_ino =le32_to_cpu (sbp->s_first_ino); +if (nilfs->ns_first_ino <NILFS_USER_INO ) { +nilfs_err (nilfs->ns_sb, +"too small lower limit for non-reserved inode numbers: %u" , + nilfs->ns_first_ino); +return -EINVAL ; + } nilfs->ns_blocks_per_segment =le32_to_cpu (sbp->s_blocks_per_segment);if (nilfs->ns_blocks_per_segment <NILFS_SEG_MIN_BLOCKS ) {
fs/nilfs2/the_nilfs.h +1 -1
@@ -182,7 +182,7 @@ struct the_nilfs {unsigned long ns_nrsvsegs;unsigned long ns_first_data_block;int ns_inode_size; -int ns_first_ino; +unsigned int ns_first_ino;u32 ns_crc_seed;/* /sys/fs/<nilfs>/<device> */
Greg Kroah-Hartman
maintainerPATCH 35/108 nilfs2: add missing check for inode numbers on directory entries
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit bb76c6c274683c8570ad788f79d4b875bde0e458 upstream.
Syzbot reported that mounting and unmounting a specific pattern of corrupted nilfs2 filesystem images causes a use-after-free of metadata file inodes, which triggers a kernel bug in lru_add_fn().
As Jan Kara pointed out, this is because the link count of a metadata file gets corrupted to 0, and nilfs_evict_inode(), which is called from iput(), tries to delete that inode (ifile inode in this case).
The inconsistency occurs because directories containing the inode numbers of these metadata files that should not be visible in the namespace are read without checking.
Fix this issue by treating the inode numbers of these internal files as errors in the sanity check helper when reading directory folios/pages.
Also thanks to Hillf Danton and Matthew Wilcox for their initial mm-layer analysis.
--- fs/nilfs2/dir.c | 6 ++++++ fs/nilfs2/nilfs.h | 5 +++++ 2 files changed, 11 insertions(+)
fs/nilfs2/dir.c +6 -0
@@ -143,6 +143,9 @@ static bool nilfs_check_page(struct page goto Enamelen;if (((offs + rec_len -1 ) ^ offs) & ~(chunk_size-1 )) goto Espan; +if (unlikely (p->inode && +NILFS_PRIVATE_INODE (le64_to_cpu (p->inode)))) + goto Einumber; }if (offs != limit) goto Eend;
@@ -168,6 +171,9 @@ Enamelen: goto bad_entry; Espan: error ="directory entry across blocks" ; + goto bad_entry; +Einumber: + error ="disallowed inode number" ; bad_entry: nilfs_error(sb, "bad entry in directory #%lu: %s - offset=%lu, inode=%lu, rec_len=%d, name_len=%d",
fs/nilfs2/nilfs.h +5 -0
@@ -121,6 +121,11 @@ enum { ((ino) >=NILFS_FIRST_INO (sb) || \ ((ino) < NILFS_USER_INO && (NILFS_SYS_INO_BITS & BIT(ino)))) +#define NILFS_PRIVATE_INODE (ino) ({ \ + ino_t __ino = (ino); \ + ((__ino) < NILFS_USER_INO && (__ino) != NILFS_ROOT_INO && \ + (__ino) != NILFS_SKETCH_INO); }) +/** * struct nilfs_transaction_info: context information for synchronization * @ti_magic: Magic number
Greg Kroah-Hartman
maintainerPATCH 36/108 mm: optimize the redundant loop of mm_update_owner_next()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jinliang Zheng <[email protected]>
commit cf3f9a593dab87a032d2b6a6fb205e7f3de4f0a1 upstream.
When mm_update_owner_next() is racing with swapoff (try_to_unuse()) or /proc or ptrace or page migration (get_task_mm()), it is impossible to find an appropriate task_struct in the loop whose mm_struct is the same as the target mm_struct.
If the above race condition is combined with the stress-ng-zombie and stress-ng-dup tests, such a long loop can easily cause a Hard Lockup in write_lock_irq() for tasklist_lock.
Recognize this situation in advance and exit early.
--- kernel/exit.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/exit.c +2 -0
@@ -432,6 +432,8 @@ retry:* Search through everything else, we should not get here often. */ for_each_process (g) { +if (atomic_read (&mm->mm_users) <=1 ) +break ;if (g->flags &PF_KTHREAD )continue ;for_each_thread (g, c) {
Greg Kroah-Hartman
maintainerPATCH 37/108 mm: avoid overflows in dirty throttling logic
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 385d838df280eba6c8680f9777bfa0d0bfe7e8b2 upstream.
The dirty throttling logic is interspersed with assumptions that dirty limits in PAGE_SIZE units fit into 32-bit (so that various multiplications fit into 64-bits). If limits end up being larger, we will hit overflows, possible divisions by 0 etc. Fix these problems by never allowing so large dirty limits as they have dubious practical value anyway. For dirty_bytes / dirty_background_bytes interfaces we can just refuse to set so large limits. For dirty_ratio / dirty_background_ratio it isn't so simple as the dirty limit is computed from the amount of available memory which can change due to memory hotplug etc. So when converting dirty limits from ratios to numbers of pages, we just don't allow the result to exceed UINT_MAX.
This is root-only triggerable problem which occurs when the operator sets dirty limits to >16 TB.
--- mm/page-writeback.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
mm/page-writeback.c +26 -4
@@ -432,13 +432,20 @@ static void domain_dirty_limits(struct delse bg_thresh = (bg_ratio * available_memory) /PAGE_SIZE ; -if (bg_thresh >= thresh) - bg_thresh = thresh /2 ; tsk = current;if (rt_task (tsk)) { bg_thresh += bg_thresh /4 + global_wb_domain.dirty_limit /32 ; thresh += thresh /4 + global_wb_domain.dirty_limit /32 ; } +/* +* Dirty throttling logic assumes the limits in page units fit into +* 32-bits. This gives 16TB dirty limits max which is hopefully enough. +*/ +if (thresh >UINT_MAX ) + thresh =UINT_MAX ; +/* This makes sure bg_thresh is within 32-bits as well */ +if (bg_thresh >= thresh) + bg_thresh = thresh /2 ; dtc->thresh = thresh; dtc->bg_thresh = bg_thresh;
@@ -488,7 +495,11 @@ static unsigned long node_dirty_limit(stif (rt_task (tsk)) dirty += dirty /4 ; -return dirty; +/* +* Dirty throttling logic assumes the limits in page units fit into +* 32-bits. This gives 16TB dirty limits max which is hopefully enough. +*/ + return min_t(unsigned long, dirty, UINT_MAX); }/**
@@ -524,10 +535,17 @@ int dirty_background_bytes_handler(struc void *buffer, size_t *lenp, loff_t *ppos) { int ret; +unsigned long old_bytes = dirty_background_bytes; ret =proc_doulongvec_minmax (table, write, buffer, lenp, ppos); -if (ret ==0 && write) +if (ret ==0 && write) { +if (DIV_ROUND_UP (dirty_background_bytes,PAGE_SIZE ) > +UINT_MAX ) { + dirty_background_bytes = old_bytes; +return -ERANGE ; + } dirty_background_ratio =0 ; + }return ret; }
@@ -553,6 +571,10 @@ int dirty_bytes_handler(struct ctl_table ret =proc_doulongvec_minmax (table, write, buffer, lenp, ppos);if (ret ==0 && write && vm_dirty_bytes != old_bytes) { +if (DIV_ROUND_UP (vm_dirty_bytes,PAGE_SIZE ) >UINT_MAX ) { + vm_dirty_bytes = old_bytes; +return -ERANGE ; + }writeback_set_ratelimit (); vm_dirty_ratio =0 ; }
Greg Kroah-Hartman
maintainerPATCH 38/108 Bluetooth: qca: Fix BT enable failure again for QCA6390 after warm reboot
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
commit 88e72239ead9814b886db54fc4ee39ef3c2b8f26 upstream.
Commit 272970be3dab ("Bluetooth: hci_qca: Fix driver shutdown on closed serdev") will cause below regression issue:
BT can't be enabled after below steps:
cold boot -> enable BT -> disable BT -> warm reboot -> BT enable failure if property enable-gpios is not configured within DT|ACPI for QCA6390.
The commit is to fix a use-after-free issue within qca_serdev_shutdown() by adding condition to avoid the serdev is flushed or wrote after closed but also introduces this regression issue regarding above steps since the VSC is not sent to reset controller during warm reboot.
Fixed by sending the VSC to reset controller within qca_serdev_shutdown() once BT was ever enabled, and the use-after-free issue is also fixed by this change since the serdev is still opened before it is flushed or wrote.
Verified by the reported machine Dell XPS 13 9310 laptop over below two kernel commits:
commit e00fc2700a3f ("Bluetooth: btusb: Fix triggering coredump implementation for QCA") of bluetooth-next tree.
commit b23d98d46d28 ("Bluetooth: btusb: Fix triggering coredump implementation for QCA") of linus mainline tree.
--- drivers/bluetooth/hci_qca.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/bluetooth/hci_qca.c +15 -3
@@ -2076,15 +2076,27 @@ static void qca_serdev_shutdown(struct dstruct qca_serdev *qcadev =serdev_device_get_drvdata (serdev);struct hci_uart *hu = &qcadev->serdev_hu;struct hci_dev *hdev = hu->hdev; -struct qca_data *qca = hu->priv;const u8 ibs_wake_cmd[] = {0xFD };const u8 edl_reset_soc_cmd[] = {0x01 ,0x00 ,0xFC ,0x01 ,0x05 };if (qcadev->btsoc_type ==QCA_QCA6390 ) { -if (test_bit (QCA_BT_OFF , &qca->flags) || - !test_bit (HCI_RUNNING , &hdev->flags)) +/* The purpose of sending the VSC is to reset SOC into a initial +* state and the state will ensure next hdev->setup() success. +* if HCI_QUIRK_NON_PERSISTENT_SETUP is set, it means that +* hdev->setup() can do its job regardless of SoC state, so +* don't need to send the VSC. +* if HCI_SETUP is set, it means that hdev->setup() was never +* invoked and the SOC is already in the initial state, so +* don't also need to send the VSC. +*/ +if (test_bit (HCI_QUIRK_NON_PERSISTENT_SETUP , &hdev->quirks) || +hci_dev_test_flag (hdev,HCI_SETUP ))return ; +/* The serdev must be in open state when conrol logic arrives +* here, so also fix the use-after-free issue caused by that +* the serdev is flushed or wrote after it is closed. +*/ serdev_device_write_flush (serdev); ret =serdev_device_write_buf (serdev, ibs_wake_cmd,sizeof (ibs_wake_cmd));
Greg Kroah-Hartman
maintainerPATCH 29/108 wifi: wilc1000: fix ies_len type in connect path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jozef Hopko <[email protected]>
[ Upstream commit 39ab8fff623053a50951b659e5f6b72343d7d78c ]
Commit 205c50306acf ("wifi: wilc1000: fix RCU usage in connect path") made sure that the IEs data was manipulated under the relevant RCU section. Unfortunately, while doing so, the commit brought a faulty implicit cast from int to u8 on the ies_len variable, making the parsing fail to be performed correctly if the IEs block is larger than 255 bytes. This failure can be observed with Access Points appending a lot of IEs TLVs in their beacon frames (reproduced with a Pixel phone acting as an Access Point, which brough 273 bytes of IE data in my testing environment).
Fix IEs parsing by removing this undesired implicit cast.
--- drivers/net/wireless/microchip/wilc1000/hif.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/microchip/wilc1000/hif.c +2 -1
@@ -364,7 +364,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,struct ieee80211_p2p_noa_attr noa_attr;const struct cfg80211_bss_ies *ies;struct wilc_join_bss_param *param; -u8 rates_len =0 , ies_len; +u8 rates_len =0 ; +int ies_len;int ret; param =kzalloc (sizeof (*param),GFP_KERNEL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/108 net: lantiq_etop: add blank line after declaration
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksander Jan Bajkowski <[email protected]>
[ Upstream commit 4c46625bb586a741b8d0e6bdbddbcb2549fa1d36 ]
This patch adds a missing line after the declaration and fixes the checkpatch warning:
WARNING: Missing a blank line after declarations
+ int desc;
+ for (desc = 0; desc < LTQ_DESC_NUM; desc++)
Stable-dep-of: e1533b6319ab ("net: ethernet: lantiq_etop: fix double free in detach")
--- drivers/net/ethernet/lantiq_etop.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/lantiq_etop.c +1 -0
@@ -214,6 +214,7 @@ ltq_etop_free_channel(struct net_device *dev, struct ltq_etop_chan *ch)free_irq (ch->dma.irq, priv);if (IS_RX (ch->idx)) {int desc; +for (desc =0 ; desc <LTQ_DESC_NUM ; desc++)dev_kfree_skb_any (ch->skb[ch->dma.desc]); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 73/108 tcp: use signed arithmetic in tcp_rtx_probe0_timed_out()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 36534d3c54537bf098224a32dc31397793d4594d upstream.
Due to timer wheel implementation, a timer will usually fire after its schedule.
For instance, for HZ=1000, a timeout between 512ms and 4s has a granularity of 64ms.
For this range of values, the extra delay could be up to 63ms.
For TCP, this means that tp->rcv_tstamp may be after inet_csk(sk)->icsk_timeout whenever the timer interrupt finally triggers, if one packet came during the extra delay.
We need to make sure tcp_rtx_probe0_timed_out() handles this case.
--- net/ipv4/tcp_timer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/ipv4/tcp_timer.c +6 -1
@@ -459,8 +459,13 @@ static bool tcp_rtx_probe0_timed_out(con {const struct tcp_sock *tp =tcp_sk (sk);const int timeout =TCP_RTO_MAX *2 ; -u32 rcv_delta, rtx_delta; +u32 rtx_delta; +s32 rcv_delta; +/* Note: timer interrupt might have been delayed by at least one jiffy, +* and tp->rcv_tstamp might very well have been written recently. +* rcv_delta can thus be negative. +*/ rcv_delta =inet_csk (sk)->icsk_timeout - tp->rcv_tstamp;if (rcv_delta <= timeout)return false;
Greg Kroah-Hartman
maintainerPATCH 74/108 tcp: avoid too many retransmit packets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 97a9063518f198ec0adb2ecb89789de342bb8283 upstream.
If a TCP socket is using TCP_USER_TIMEOUT, and the other peer retracted its window to zero, tcp_retransmit_timer() can retransmit a packet every two jiffies (2 ms for HZ=1000), for about 4 minutes after TCP_USER_TIMEOUT has 'expired'.
The fix is to make sure tcp_rtx_probe0_timed_out() takes icsk->icsk_user_timeout into account.
Before blamed commit, the socket would not timeout after icsk->icsk_user_timeout, but would use standard exponential backoff for the retransmits.
Also worth noting that before commit e89688e3e978 ("net: tcp:
fix unexcepted socket die when snd_wnd is 0"), the issue would last 2 minutes instead of 4.
--- net/ipv4/tcp_timer.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
net/ipv4/tcp_timer.c +17 -5
@@ -440,22 +440,34 @@ static void tcp_fastopen_synack_timer(ststatic bool tcp_rtx_probe0_timed_out (const struct sock *sk,const struct sk_buff *skb) { +const struct inet_connection_sock *icsk =inet_csk (sk); +u32 user_timeout =READ_ONCE (icsk->icsk_user_timeout);const struct tcp_sock *tp =tcp_sk (sk); -const int timeout =TCP_RTO_MAX *2 ; +int timeout =TCP_RTO_MAX *2 ;u32 rtx_delta;s32 rcv_delta; + rtx_delta = (u32 )msecs_to_jiffies (tcp_time_stamp (tp) - + (tp->retrans_stamp ?:tcp_skb_timestamp (skb))); + +if (user_timeout) { +/* If user application specified a TCP_USER_TIMEOUT, +* it does not want win 0 packets to 'reset the timer' +* while retransmits are not making progress. +*/ +if (rtx_delta > user_timeout) +return true; + timeout =min_t (u32, timeout,msecs_to_jiffies (user_timeout)); + } +/* Note: timer interrupt might have been delayed by at least one jiffy, * and tp->rcv_tstamp might very well have been written recently. * rcv_delta can thus be negative. */ - rcv_delta =inet_csk (sk)->icsk_timeout - tp->rcv_tstamp; + rcv_delta = icsk->icsk_timeout - tp->rcv_tstamp;if (rcv_delta <= timeout)return false; - rtx_delta = (u32 )msecs_to_jiffies (tcp_time_stamp (tp) - - (tp->retrans_stamp ?:tcp_skb_timestamp (skb))); -return rtx_delta > timeout; }
Greg Kroah-Hartman
maintainerPATCH 75/108 net: ks8851: Fix potential TX stall after interface reopen
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronald Wahl <[email protected]>
commit 7a99afef17af66c276c1d6e6f4dbcac223eaf6ac upstream.
The amount of TX space in the hardware buffer is tracked in the tx_space variable. The initial value is currently only set during driver probing.
After closing the interface and reopening it the tx_space variable has the last value it had before close. If it is smaller than the size of the first send packet after reopeing the interface the queue will be stopped. The queue is woken up after receiving a TX interrupt but this will never happen since we did not send anything.
This commit moves the initialization of the tx_space variable to the ks8851_net_open function right before starting the TX queue. Also query the value from the hardware instead of using a hard coded value.
Only the SPI chip variant is affected by this issue because only this driver variant actually depends on the tx_space variable in the xmit function.
--- drivers/net/ethernet/micrel/ks8851_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/micrel/ks8851_common.c +1 -1
@@ -501,6 +501,7 @@ static int ks8851_net_open(struct net_deks8851_wrreg16 (ks,KS_IER , ks->rc_ier); ks->queued_len =0 ; + ks->tx_space =ks8851_rdreg16 (ks,KS_TXMIR );netif_start_queue (ks->netdev);netif_dbg (ks, ifup, ks->netdev,"network device up\n" );
@@ -1057,7 +1058,6 @@ int ks8851_probe_common(struct net_devicint ret; ks->netdev = netdev; - ks->tx_space =6144 ; gpio =of_get_named_gpio_flags (dev->of_node,"reset-gpios" ,0 ,NULL );if (gpio == -EPROBE_DEFER )
Greg Kroah-Hartman
maintainerPATCH 76/108 USB: serial: option: add Telit generic core-dump composition
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniele Palmas <[email protected]>
commit 4298e400dbdbf259549d69c349e060652ad53611 upstream.
Add the following core-dump composition, used in different Telit modems:
0x9000: tty (sahara)
T: Bus=03 Lev=01 Prnt=03 Port=07 Cnt=01 Dev#= 41 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=9000 Rev=00.00 S: Manufacturer=Telit Cinterion S: Product=FN990-dump S: SerialNumber=e815bdde C: #Ifs= 1 Cfg#= 1 Atr=a0 MxPwr=2mA I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=10 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -1433,6 +1433,8 @@ static const struct usb_device_id option .driver_info = NCTRL(2) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x701b, 0xff), /* Telit LE910R1 (ECM) */ .driver_info = NCTRL(2) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x9000, 0xff), /* Telit generic core-dump device */ + .driver_info = NCTRL(0) }, { USB_DEVICE(TELIT_VENDOR_ID, 0x9010), /* Telit SBL FN980 flashing device */ .driver_info = NCTRL(0) | ZLP }, { USB_DEVICE(TELIT_VENDOR_ID, 0x9200), /* Telit LE910S1 flashing device */
Greg Kroah-Hartman
maintainerPATCH 77/108 USB: serial: option: add Telit FN912 rmnet compositions
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniele Palmas <[email protected]>
commit 9a590ff283421b71560deded2110dbdcbe1f7d1d upstream.
Add the following Telit FN912 compositions:
0x3000: rmnet + tty (AT/NMEA) + tty (AT) + tty (diag)
T: Bus=03 Lev=01 Prnt=03 Port=07 Cnt=01 Dev#= 8 Spd=480 MxCh= 0 D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=3000 Rev=05.15 S: Manufacturer=Telit Cinterion S: Product=FN912 S: SerialNumber=92c4c4d8 C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
0x3001: rmnet + tty (AT) + tty (diag) + DPL (data packet logging) + adb
T: Bus=03 Lev=01 Prnt=03 Port=07 Cnt=01 Dev#= 7 Spd=480 MxCh= 0 D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=3001 Rev=05.15 S: Manufacturer=Telit Cinterion S: Product=FN912 S: SerialNumber=92c4c4d8 C: #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=80 Driver=(none) E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=usbfs E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -1425,6 +1425,10 @@ static const struct usb_device_id option .driver_info = NCTRL(0) | RSVD(1) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */ .driver_info = NCTRL(0) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x3000, 0xff), /* Telit FN912 */ + .driver_info = RSVD(0) | NCTRL(3) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x3001, 0xff), /* Telit FN912 */ + .driver_info = RSVD(0) | NCTRL(2) | RSVD(3) | RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7010, 0xff), /* Telit LE910-S1 (RNDIS) */ .driver_info = NCTRL(2) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7011, 0xff), /* Telit LE910-S1 (ECM) */
Greg Kroah-Hartman
maintainerPATCH 78/108 USB: serial: option: add Fibocom FM350-GL
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit 2604e08ff251dba330e16b65e80074c9c540aad7 upstream.
FM350-GL is 5G Sub-6 WWAN module which uses M.2 form factor interface. It is based on Mediatek's MTK T700 CPU. The module supports PCIe Gen3 x1 and USB 2.0 and 3.0 interfaces.
The manufacturer states that USB is "for debug" but it has been confirmed to be fully functional, except for modem-control requests on some of the interfaces.
USB device composition is controlled by AT+GTUSBMODE=<mode> command. Two values are currently supported for the <mode>:
40: RNDIS+AT+AP(GNSS)+META+DEBUG+NPT+ADB
41: RNDIS+AT+AP(GNSS)+META+DEBUG+NPT+ADB+AP(LOG)+AP(META) (default value)
[ Note that the functions above are not ordered by interface number. ]
Mode 40 corresponds to:
T: Bus=03 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 22 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0e8d ProdID=7126 Rev= 0.01 S: Manufacturer=Fibocom Wireless Inc. S: Product=FM350-GL
C:* #Ifs= 8 Cfg#= 1 Atr=a0 MxPwr=500mA
A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=03
I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=ff Driver=rndis_host
E: Ad=82(I) Atr=03(Int.) MxPS= 64 Ivl=125us
I:* If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=rndis_host
E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Mode 41 corresponds to:
T: Bus=03 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 7 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0e8d ProdID=7127 Rev= 0.01 S: Manufacturer=Fibocom Wireless Inc. S: Product=FM350-GL
C:* #Ifs=10 Cfg#= 1 Atr=a0 MxPwr=500mA
A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=03
I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=ff Driver=rndis_host
E: Ad=82(I) Atr=03(Int.) MxPS= 64 Ivl=125us
I:* If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=rndis_host
E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 8 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=89(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 9 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=8a(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=09(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -2230,6 +2230,10 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7106_2COM, 0x02, 0x02, 0x01) }, { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) }, { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) }, + { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x7126, 0xff, 0x00, 0x00), + .driver_info = NCTRL(2) }, + { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x7127, 0xff, 0x00, 0x00), + .driver_info = NCTRL(2) | NCTRL(3) | NCTRL(4) }, { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) }, { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MPL200), .driver_info = RSVD(1) | RSVD(4) },
Greg Kroah-Hartman
maintainerPATCH 79/108 USB: serial: option: add support for Foxconn T99W651
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Slark Xiao <[email protected]>
commit 3c841d54b63e4446383de3238399a3910e47d8e2 upstream.
T99W651 is a RNDIS based modem device. There are 3 serial ports need to be enumerated: Diag, NMEA and AT.
Test evidence as below:
T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 6 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0489 ProdID=e145 Rev=05.15 S: Manufacturer=QCOM S: Product=SDXPINN-IDP _SN:93B562B2 S: SerialNumber=82e6fe26 C: #Ifs= 7 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 1 Cls=ef(misc ) Sub=04 Prot=01 Driver=rndis_host I: If#=0x1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=rndis_host I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option I: If#=0x4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option I: If#=0x5 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=70 Driver=(none) I: If#=0x6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
0&1: RNDIS, 2:AT, 3:NMEA, 4:DIAG, 5:QDSS, 6:ADB
QDSS is not a serial port.
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -2294,6 +2294,8 @@ static const struct usb_device_id option .driver_info = RSVD(3) }, { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0f0, 0xff), /* Foxconn T99W373 MBIM */ .driver_info = RSVD(3) }, + { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe145, 0xff), /* Foxconn T99W651 RNDIS */ + .driver_info = RSVD(5) | RSVD(6) }, { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 (IOT version) */ .driver_info = RSVD(4) | RSVD(5) | RSVD(6) }, { USB_DEVICE(0x1782, 0x4d10) }, /* Fibocom L610 (AT mode) */
Greg Kroah-Hartman
maintainerPATCH 80/108 USB: serial: option: add Netprisma LCUK54 series modules
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mank Wang <[email protected]>
commit dc6dbe3ed28795b01c712ad8f567728f9c14b01d upstream.
Add support for Netprisma LCUK54 series modules.
LCUK54-WRD-LWW(0x3731/0x0100): NetPrisma LCUK54-WWD for Global LCUK54-WRD-LWW(0x3731/0x0101): NetPrisma LCUK54-WRD for Global SKU LCUK54-WRD-LCN(0x3731/0x0106): NetPrisma LCUK54-WRD for China SKU LCUK54-WRD-LWW(0x3731/0x0111): NetPrisma LCUK54-WWD for SA LCUK54-WRD-LWW(0x3731/0x0112): NetPrisma LCUK54-WWD for EU LCUK54-WRD-LWW(0x3731/0x0113): NetPrisma LCUK54-WWD for NA LCUK54-WWD-LCN(0x3731/0x0115): NetPrisma LCUK54-WWD for China EDU LCUK54-WWD-LWW(0x3731/0x0116): NetPrisma LCUK54-WWD for Golbal EDU
Above products use the exact same interface layout and option driver:
MBIM + GNSS + DIAG + NMEA + AT + QDSS + DPL
T: Bus=03 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 5 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=3731 ProdID=0101 Rev= 5.04 S: Manufacturer=NetPrisma S: Product=LCUK54-WRD S: SerialNumber=b6250c36 C:* #Ifs= 8 Cfg#= 1 Atr=a0 MxPwr=500mA A: FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=0e Prot=00 I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=82(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=option E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 6 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=70 Driver=(none)
E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 7 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=80 Driver=(none)
E: Ad=8f(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/usb/serial/option.c +24 -0
@@ -2333,6 +2333,30 @@ static const struct usb_device_id option .driver_info = RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0115, 0xff), /* Rolling RW135-GL (laptop MBIM) */ .driver_info = RSVD(5) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WWD for Global */ + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0101, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WRD for Global SKU */ + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0101, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0101, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0106, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WRD for China SKU */ + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0106, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0106, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0111, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WWD for SA */ + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0111, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0111, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0112, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WWD for EU */ + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0112, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0112, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0113, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WWD for NA */ + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0113, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0113, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0115, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WWD for China EDU */ + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0115, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0115, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0116, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WWD for Golbal EDU */ + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0116, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0116, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(OPPO_VENDOR_ID, OPPO_PRODUCT_R11, 0xff, 0xff, 0x30) }, { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) }, { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x40) },
Greg Kroah-Hartman
maintainerPATCH 81/108 USB: serial: option: add Rolling RW350-GL variants
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vanillan Wang <[email protected]>
commit ae420771551bd9f04347c59744dd062332bdec3e upstream.
Update the USB serial option driver support for the Rolling RW350-GL
- VID:PID 33f8:0802, RW350-GL are laptop M.2 cards (with MBIM interfaces for /Linux/Chrome OS)
Here are the outputs of usb-devices:
usbmode=63: mbim, pipe
T: Bus=02 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=5000 MxCh= 0 D: Ver= 3.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 P: Vendor=33f8 ProdID=0802 Rev=00.01 S: Manufacturer=Rolling Wireless S.a.r.l. S: Product=USB DATA CARD C: #Ifs= 3 Cfg#= 1 Atr=a0 MxPwr=896mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=82(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
usbmode=64: mbim, others at (If#= 5 adb)
MBIM(MI0) + GNSS(MI2) + AP log(MI3) + AP META(MI4) + ADB(MI5) + MD AT(MI6) + MD META(MI7) + NPT(MI8) + Debug(MI9)
T: Bus=02 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 5 Spd=5000 MxCh= 0 D: Ver= 3.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 P: Vendor=33f8 ProdID=0802 Rev=00.01 S: Manufacturer=Rolling Wireless S.a.r.l. S: Product=USB DATA CARD C: #Ifs=10 Cfg#= 1 Atr=a0 MxPwr=896mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=82(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=84(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=usbfs E: Ad=05(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=86(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=06(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=07(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=88(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 8 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=08(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=89(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 9 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=09(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=8a(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -2333,6 +2333,8 @@ static const struct usb_device_id option .driver_info = RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0115, 0xff), /* Rolling RW135-GL (laptop MBIM) */ .driver_info = RSVD(5) }, + { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0802, 0xff), /* Rolling RW350-GL (laptop MBIM) */ + .driver_info = RSVD(5) }, { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WWD for Global */ { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0x00, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0xff, 0x40) },
Greg Kroah-Hartman
maintainerPATCH 82/108 USB: serial: mos7840: fix crash on resume
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Smirnov <[email protected]>
commit c15a688e49987385baa8804bf65d570e362f8576 upstream.
Since commit c49cfa917025 ("USB: serial: use generic method if no alternative is provided in usb serial layer"), USB serial core calls the generic resume implementation when the driver has not provided one.
This can trigger a crash on resume with mos7840 since support for multiple read URBs was added back in 2011. Specifically, both port read URBs are now submitted on resume for open ports, but the context pointer of the second URB is left set to the core rather than mos7840 port structure.
Fix this by implementing dedicated suspend and resume functions for mos7840.
Tested with Delock 87414 USB 2.0 to 4x serial adapter.
[ johan: analyse crash and rewrite commit message; set busy flag on
resume; drop bulk-in check; drop unnecessary usb_kill_urb() ]
--- drivers/usb/serial/mos7840.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
drivers/usb/serial/mos7840.c +45 -0
@@ -1764,6 +1764,49 @@ static int mos7840_port_remove(struct usreturn 0 ; } +static int mos7840_suspend (struct usb_serial *serial,pm_message_t message) +{ +struct moschip_port *mos7840_port; +struct usb_serial_port *port; +int i; + +for (i =0 ; i < serial->num_ports; ++i) { + port = serial->port[i]; +if (!tty_port_initialized (&port->port)) +continue ; + + mos7840_port =usb_get_serial_port_data (port); + +usb_kill_urb (mos7840_port->read_urb); + mos7840_port->read_urb_busy = false; + } + +return 0 ; +} + +static int mos7840_resume (struct usb_serial *serial) +{ +struct moschip_port *mos7840_port; +struct usb_serial_port *port; +int res; +int i; + +for (i =0 ; i < serial->num_ports; ++i) { + port = serial->port[i]; +if (!tty_port_initialized (&port->port)) +continue ; + + mos7840_port =usb_get_serial_port_data (port); + + mos7840_port->read_urb_busy = true; + res =usb_submit_urb (mos7840_port->read_urb,GFP_NOIO ); +if (res) + mos7840_port->read_urb_busy = false; + } + +return 0 ; +} +static struct usb_serial_driver moschip7840_4port_device = { .driver = { .owner =THIS_MODULE ,
@@ -1792,6 +1835,8 @@ static struct usb_serial_driver moschip7 .port_probe = mos7840_port_probe, .port_remove = mos7840_port_remove, .read_bulk_callback = mos7840_bulk_in_callback, + .suspend = mos7840_suspend, + .resume = mos7840_resume, };static struct usb_serial_driver *const serial_drivers[] = {
Greg Kroah-Hartman
maintainerPATCH 65/108 net: ethernet: lantiq_etop: fix double free in detach
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksander Jan Bajkowski <[email protected]>
[ Upstream commit e1533b6319ab9c3a97dad314dd88b3783bc41b69 ]
The number of the currently released descriptor is never incremented which results in the same skb being released multiple times.
--- drivers/net/ethernet/lantiq_etop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/lantiq_etop.c +2 -2
@@ -213,9 +213,9 @@ ltq_etop_free_channel(struct net_device *dev, struct ltq_etop_chan *ch)if (ch->dma.irq)free_irq (ch->dma.irq, priv);if (IS_RX (ch->idx)) { -int desc; +struct ltq_dma_channel *dma = &ch->dma; -for (desc =0 ; desc <LTQ_DESC_NUM ; desc++) +for (dma->desc =0 ; dma->desc <LTQ_DESC_NUM ; dma->desc++)dev_kfree_skb_any (ch->skb[ch->dma.desc]); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 83/108 USB: Add USB_QUIRK_NO_SET_INTF quirk for START BP-850k
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: WangYuli <[email protected]>
commit 3859e85de30815a20bce7db712ce3d94d40a682d upstream.
START BP-850K is a dot matrix printer that crashes when it receives a Set-Interface request and needs USB_QUIRK_NO_SET_INTF to work properly.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -504,6 +504,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x1b1c, 0x1b38), .driver_info = USB_QUIRK_DELAY_INIT | USB_QUIRK_DELAY_CTRL_MSG }, + /* START BP-850k Printer */ + { USB_DEVICE(0x1bc3, 0x0003), .driver_info = USB_QUIRK_NO_SET_INTF }, + /* MIDI keyboard WORLDE MINI */ { USB_DEVICE(0x1c75, 0x0204), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS },
Greg Kroah-Hartman
maintainerPATCH 84/108 usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lee Jones <[email protected]>
commit 6d3c721e686ea6c59e18289b400cc95c76e927e0 upstream.
Userspace provided string 's' could trivially have the length zero. Left unchecked this will firstly result in an OOB read in the form if (str[0 - 1] == '\n') followed closely by an OOB write in the form str[0 - 1] = '\0'`.
There is already a validating check to catch strings that are too long. Let's supply an additional check for invalid strings that are too short.
--- drivers/usb/gadget/configfs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/gadget/configfs.c +3 -0
@@ -104,9 +104,12 @@ static int usb_string_copy(const char *sint ret;char *str;char *copy = *s_copy; + ret =strlen (s);if (ret >USB_MAX_STRING_LEN )return -EOVERFLOW ; +if (ret <1 ) +return -EINVAL ;if (copy) { str = copy;
Greg Kroah-Hartman
maintainerPATCH 85/108 USB: core: Fix duplicate endpoint bug by clearing reserved bits in the descriptor
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit a368ecde8a5055b627749b09c6218ef793043e47 upstream.
Syzbot has identified a bug in usbcore (see the Closes: tag below) caused by our assumption that the reserved bits in an endpoint descriptor's bEndpointAddress field will always be 0. As a result of the bug, the endpoint_is_duplicate() routine in config.c (and possibly other routines as well) may believe that two descriptors are for distinct endpoints, even though they have the same direction and endpoint number. This can lead to confusion, including the bug identified by syzbot (two descriptors with matching endpoint numbers and directions, where one was interrupt and the other was bulk).
To fix the bug, we will clear the reserved bits in bEndpointAddress when we parse the descriptor. (Note that both the USB-2.0 and USB-3.1 specs say these bits are "Reserved, reset to zero".) This requires us to make a copy of the descriptor earlier in usb_parse_endpoint() and use the copy instead of the original when checking for duplicates.
--- drivers/usb/core/config.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/usb/core/config.c +15 -3
@@ -291,6 +291,20 @@ static int usb_parse_endpoint(struct devif (ifp->desc.bNumEndpoints >= num_ep) goto skip_to_next_endpoint_or_interface_descriptor; +/* Save a copy of the descriptor and use it instead of the original */ + endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints]; +memcpy (&endpoint->desc, d, n); + d = &endpoint->desc; + +/* Clear the reserved bits in bEndpointAddress */ + i = d->bEndpointAddress & + (USB_ENDPOINT_DIR_MASK |USB_ENDPOINT_NUMBER_MASK ); +if (i != d->bEndpointAddress) { +dev_notice (ddev,"config %d interface %d altsetting %d has an endpoint descriptor with address 0x%X, changing to 0x%X\n" , + cfgno, inum, asnum, d->bEndpointAddress, i); + endpoint->desc.bEndpointAddress = i; + } +/* Check for duplicate endpoint addresses */ if (config_endpoint_is_duplicate (config, inum, asnum, d)) { dev_notice(ddev, "config %d interface %d altsetting %d has a duplicate endpoint with address 0x%X, skipping\n",
@@ -308,10 +322,8 @@ static int usb_parse_endpoint(struct dev } } - endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints]; +/* Accept this endpoint */ ++ifp->desc.bNumEndpoints; - -memcpy (&endpoint->desc, d, n);INIT_LIST_HEAD (&endpoint->urb_list);/*
Greg Kroah-Hartman
maintainerPATCH 86/108 hpet: Support 32-bit userspace
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: He Zhe <[email protected]>
commit 4e60131d0d36af65ab9c9144f4f163fe97ae36e8 upstream.
hpet_compat_ioctl and read file operations failed to handle parameters from 32-bit userspace and thus samples/timers/hpet_example.c fails as below.
root@intel-x86-64:~# ./hpet_example-32.out poll /dev/hpet 1 2 -hpet: executing poll hpet_poll: HPET_IRQFREQ failed
This patch fixes cmd and arg handling in hpet_compat_ioctl and adds compat handling for 32-bit userspace in hpet_read.
hpet_example now shows that it works for both 64-bit and 32-bit.
root@intel-x86-64:~# ./hpet_example-32.out poll /dev/hpet 1 2 -hpet: executing poll hpet_poll: info.hi_flags 0x0 hpet_poll: expired time = 0xf4298 hpet_poll: revents = 0x1 hpet_poll: data 0x1 hpet_poll: expired time = 0xf4235 hpet_poll: revents = 0x1 hpet_poll: data 0x1 root@intel-x86-64:~# ./hpet_example-64.out poll /dev/hpet 1 2 -hpet: executing poll hpet_poll: info.hi_flags 0x0 hpet_poll: expired time = 0xf42a1 hpet_poll: revents = 0x1 hpet_poll: data 0x1 hpet_poll: expired time = 0xf4232 hpet_poll: revents = 0x1 hpet_poll: data 0x1
--- drivers/char/hpet.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-)
drivers/char/hpet.c +29 -5
@@ -304,8 +304,13 @@ hpet_read(struct file *file, char __userif (!devp->hd_ireqfreq)return -EIO ; -if (count <sizeof (unsigned long )) -return -EINVAL ; +if (in_compat_syscall ()) { +if (count <sizeof (compat_ulong_t)) +return -EINVAL ; + }else { +if (count <sizeof (unsigned long )) +return -EINVAL ; + }add_wait_queue (&devp->hd_waitqueue, &wait);
@@ -329,9 +334,16 @@ hpet_read(struct file *file, char __userschedule (); } - retval =put_user (data, (unsigned long __user *)buf); -if (!retval) - retval =sizeof (unsigned long ); +if (in_compat_syscall ()) { + retval =put_user (data, (compat_ulong_t __user *)buf); +if (!retval) + retval =sizeof (compat_ulong_t); + }else { + retval =put_user (data, (unsigned long __user *)buf); +if (!retval) + retval =sizeof (unsigned long ); + } + out:__set_current_state (TASK_RUNNING );remove_wait_queue (&devp->hd_waitqueue, &wait);
@@ -686,12 +698,24 @@ struct compat_hpet_info {unsigned short hi_timer; }; +/* 32-bit types would lead to different command codes which should be +* translated into 64-bit ones before passed to hpet_ioctl_common +*/ +#define COMPAT_HPET_INFO _IOR('h', 0x03, struct compat_hpet_info) +#define COMPAT_HPET_IRQFREQ _IOW('h', 0x6, compat_ulong_t) +static long hpet_compat_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {struct hpet_info info;int err; +if (cmd ==COMPAT_HPET_INFO ) + cmd =HPET_INFO ; + +if (cmd ==COMPAT_HPET_IRQFREQ ) + cmd =HPET_IRQFREQ ; +mutex_lock (&hpet_mutex); err =hpet_ioctl_common (file->private_data, cmd, arg, &info);mutex_unlock (&hpet_mutex);
Greg Kroah-Hartman
maintainerPATCH 87/108 nvmem: meson-efuse: Fix return value of nvmem callbacks
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joy Chakraborty <[email protected]>
commit 7a0a6d0a7c805f9380381f4deedffdf87b93f408 upstream.
Read/write callbacks registered with nvmem core expect 0 to be returned on success and a negative value to be returned on failure.
meson_efuse_read() and meson_efuse_write() call into meson_sm_call_read() and meson_sm_call_write() respectively which return the number of bytes read or written on success as per their api description.
Fix to return error if meson_sm_call_read()/meson_sm_call_write() returns an error else return 0.
--- drivers/nvmem/meson-efuse.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/nvmem/meson-efuse.c +10 -4
@@ -18,18 +18,24 @@ static int meson_efuse_read(void *contex void *val, size_t bytes) {struct meson_sm_firmware *fw = context; +int ret; -return meson_sm_call_read (fw, (u8 *)val, bytes,SM_EFUSE_READ , offset, - bytes,0 ,0 ,0 ); + ret =meson_sm_call_read (fw, (u8 *)val, bytes,SM_EFUSE_READ , offset, + bytes,0 ,0 ,0 ); + +return ret <0 ? ret :0 ; }static int meson_efuse_write (void *context,unsigned int offset,void *val,size_t bytes) {struct meson_sm_firmware *fw = context; +int ret; + + ret =meson_sm_call_write (fw, (u8 *)val, bytes,SM_EFUSE_WRITE , offset, + bytes,0 ,0 ,0 ); -return meson_sm_call_write (fw, (u8 *)val, bytes,SM_EFUSE_WRITE , offset, - bytes,0 ,0 ,0 ); +return ret <0 ? ret :0 ; }static const struct of_device_id meson_efuse_match[] = {
Greg Kroah-Hartman
maintainerPATCH 88/108 ALSA: hda/realtek: Enable Mute LED on HP 250 G7
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nazar Bilinskyi <[email protected]>
commit b46953029c52bd3a3306ff79f631418b75384656 upstream.
HP 250 G7 has a mute LED that can be made to work using quirk ALC269_FIXUP_HP_LINE1_MIC1_LED. Enable already existing quirk.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9057,6 +9057,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x83b9 ,"HP Spectre x360" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x841c ,"HP Pavilion 15-CK0xx" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x8497 ,"HP Envy x360" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ), +SND_PCI_QUIRK (0x103c ,0x84a6 ,"HP 250 G7 Notebook PC" ,ALC269_FIXUP_HP_LINE1_MIC1_LED ),SND_PCI_QUIRK (0x103c ,0x84ae ,"HP 15-db0403ng" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x84da ,"HP OMEN dc0019-ur" ,ALC295_FIXUP_HP_OMEN ), SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
Greg Kroah-Hartman
maintainerPATCH 89/108 ALSA: hda/realtek: Limit mic boost on VAIO PRO PX
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edson Juliano Drosdeck <[email protected]>
commit 6db03b1929e207d2c6e84e75a9cd78124b3d6c6d upstream.
The internal mic boost on the VAIO models VJFE-CL and VJFE-IL is too high. Fix this by applying the ALC269_FIXUP_LIMIT_INT_MIC_BOOST fixup to the machine to limit the gain.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -9190,6 +9190,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x10cf ,0x1845 ,"Lifebook U904" ,ALC269_FIXUP_LIFEBOOK_EXTMIC ),SND_PCI_QUIRK (0x10ec ,0x10f2 ,"Intel Reference board" ,ALC700_FIXUP_INTEL_REFERENCE ),SND_PCI_QUIRK (0x10ec ,0x118c ,"Medion EE4254 MD62100" ,ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE ), +SND_PCI_QUIRK (0x10ec ,0x11bc ,"VAIO VJFE-IL" ,ALC269_FIXUP_LIMIT_INT_MIC_BOOST ),SND_PCI_QUIRK (0x10ec ,0x1230 ,"Intel Reference board" ,ALC295_FIXUP_CHROME_BOOK ),SND_PCI_QUIRK (0x10ec ,0x124c ,"Intel Reference board" ,ALC295_FIXUP_CHROME_BOOK ), SND_PCI_QUIRK(0x10ec, 0x1252, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
@@ -9397,6 +9398,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1d72 ,0x1901 ,"RedmiBook 14" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1d72 ,0x1945 ,"Redmi G" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1d72 ,0x1947 ,"RedmiBook Air" ,ALC255_FIXUP_XIAOMI_HEADSET_MIC ), +SND_PCI_QUIRK (0x2782 ,0x0214 ,"VAIO VJFE-CL" ,ALC269_FIXUP_LIMIT_INT_MIC_BOOST ),SND_PCI_QUIRK (0x2782 ,0x0232 ,"CHUWI CoreBook XPro" ,ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO ),SND_PCI_QUIRK (0x2782 ,0x1707 ,"Vaio VJFE-ADL" ,ALC298_FIXUP_SPK_VOLUME ), SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),
Greg Kroah-Hartman
maintainerPATCH 90/108 libceph: fix race between delayed_work() and ceph_monc_stop()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit 69c7b2fe4c9cc1d3b1186d1c5606627ecf0de883 upstream.
The way the delayed work is handled in ceph_monc_stop() is prone to races with mon_fault() and possibly also finish_hunting(). Both of these can requeue the delayed work which wouldn't be canceled by any of the following code in case that happens after cancel_delayed_work_sync() runs -- __close_session() doesn't mess with the delayed work in order to avoid interfering with the hunting interval logic. This part was missed in commit b5d91704f53e ("libceph: behave in mon_fault() if cur_mon < 0") and use-after-free can still ensue on monc and objects that hang off of it, with monc->auth and monc->monmap being particularly susceptible to quickly being reused.
To fix this:
- clear monc->cur_mon and monc->hunting as part of closing the session in ceph_monc_stop()
- bail from delayed_work() if monc->cur_mon is cleared, similar to how it's done in mon_fault() and finish_hunting() (based on monc->hunting)
- call cancel_delayed_work_sync() after the session is closed
--- net/ceph/mon_client.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
net/ceph/mon_client.c +12 -2
@@ -1014,13 +1014,19 @@ static void delayed_work(struct work_strstruct ceph_mon_client *monc = container_of(work, struct ceph_mon_client, delayed_work.work); -dout ("monc delayed_work\n" );mutex_lock (&monc->mutex); +dout ("%s mon%d\n" , __func__, monc->cur_mon); +if (monc->cur_mon <0 ) { + goto out; + } +if (monc->hunting) {dout ("%s continuing hunt\n" , __func__);reopen_session (monc); }else {int is_auth =ceph_auth_is_authenticated (monc->auth); + +dout ("%s is_authed %d\n" , __func__, is_auth);if (ceph_con_keepalive_expired (&monc->con,CEPH_MONC_PING_TIMEOUT )) {dout ("monc keepalive timeout\n" );
@@ -1045,6 +1051,8 @@ static void delayed_work(struct work_str } }__schedule_delayed (monc); + +out:mutex_unlock (&monc->mutex); }
@@ -1157,13 +1165,15 @@ EXPORT_SYMBOL(ceph_monc_init);void ceph_monc_stop (struct ceph_mon_client *monc) {dout ("stop\n" ); -cancel_delayed_work_sync (&monc->delayed_work);mutex_lock (&monc->mutex);__close_session (monc); + monc->hunting = false; monc->cur_mon =-1 ;mutex_unlock (&monc->mutex); +cancel_delayed_work_sync (&monc->delayed_work); +/* * flush msgr queue before we destroy ourselves to ensure that: * - any work that references our embedded con is finished.
Greg Kroah-Hartman
maintainerPATCH 91/108 wireguard: allowedips: avoid unaligned 64-bit memory accesses
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 948f991c62a4018fb81d85804eeab3029c6209f8 upstream.
On the parisc platform, the kernel issues kernel warnings because swap_endian() tries to load a 128-bit IPv6 address from an unaligned memory location:
Kernel: unaligned access to 0x55f4688c in wg_allowedips_insert_v6+0x2c/0x80 [wireguard] (iir 0xf3010df)
Kernel: unaligned access to 0x55f46884 in wg_allowedips_insert_v6+0x38/0x80 [wireguard] (iir 0xf2010dc)
Avoid such unaligned memory accesses by instead using the get_unaligned_be64() helper macro.
--- drivers/net/wireguard/allowedips.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireguard/allowedips.c +2 -2
@@ -15,8 +15,8 @@ static void swap_endian(u8 *dst, const uif (bits ==32 ) { *(u32 *)dst =be32_to_cpu (*(const __be32 *)src); }else if (bits ==128 ) { - ((u64 *)dst)[0 ] =be64_to_cpu (((const __be64 *)src)[0 ]); - ((u64 *)dst)[1 ] =be64_to_cpu (((const __be64 *)src)[1 ]); + ((u64 *)dst)[0 ] =get_unaligned_be64 (src); + ((u64 *)dst)[1 ] =get_unaligned_be64 (src +8 ); } }
Greg Kroah-Hartman
maintainerPATCH 92/108 wireguard: queueing: annotate intentional data race in cpu round robin
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
commit 2fe3d6d2053c57f2eae5e85ca1656d185ebbe4e8 upstream.
KCSAN reports a race in the CPU round robin function, which, as the comment points out, is intentional:
BUG: KCSAN: data-race in wg_packet_send_staged_packets / wg_packet_send_staged_packets
read to 0xffff88811254eb28 of 4 bytes by task 3160 on cpu 1:
wg_cpumask_next_online drivers/net/wireguard/queueing.h:127 [inline]
wg_queue_enqueue_per_device_and_peer drivers/net/wireguard/queueing.h:173 [inline]
wg_packet_create_data drivers/net/wireguard/send.c:320 [inline]
wg_packet_send_staged_packets+0x60e/0xac0 drivers/net/wireguard/send.c:388
wg_packet_send_keepalive+0xe2/0x100 drivers/net/wireguard/send.c:239
wg_receive_handshake_packet drivers/net/wireguard/receive.c:186 [inline]
wg_packet_handshake_receive_worker+0x449/0x5f0 drivers/net/wireguard/receive.c:213
process_one_work kernel/workqueue.c:3248 [inline]
process_scheduled_works+0x483/0x9a0 kernel/workqueue.c:3329
worker_thread+0x526/0x720 kernel/workqueue.c:3409
kthread+0x1d1/0x210 kernel/kthread.c:389
ret_from_fork+0x4b/0x60 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
write to 0xffff88811254eb28 of 4 bytes by task 3158 on cpu 0:
wg_cpumask_next_online drivers/net/wireguard/queueing.h:130 [inline]
wg_queue_enqueue_per_device_and_peer drivers/net/wireguard/queueing.h:173 [inline]
wg_packet_create_data drivers/net/wireguard/send.c:320 [inline]
wg_packet_send_staged_packets+0x6e5/0xac0 drivers/net/wireguard/send.c:388
wg_packet_send_keepalive+0xe2/0x100 drivers/net/wireguard/send.c:239
wg_receive_handshake_packet drivers/net/wireguard/receive.c:186 [inline]
wg_packet_handshake_receive_worker+0x449/0x5f0 drivers/net/wireguard/receive.c:213
process_one_work kernel/workqueue.c:3248 [inline]
process_scheduled_works+0x483/0x9a0 kernel/workqueue.c:3329
worker_thread+0x526/0x720 kernel/workqueue.c:3409
kthread+0x1d1/0x210 kernel/kthread.c:389
ret_from_fork+0x4b/0x60 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
value changed: 0xffffffff -> 0x00000000Mark this race as intentional by using READ/WRITE_ONCE().
--- drivers/net/wireguard/queueing.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireguard/queueing.h +2 -2
@@ -126,10 +126,10 @@ static inline int wg_cpumask_choose_onli*/ static inline int wg_cpumask_next_online (int *last_cpu) { -int cpu =cpumask_next (*last_cpu, cpu_online_mask); +int cpu =cpumask_next (READ_ONCE (*last_cpu), cpu_online_mask);if (cpu >= nr_cpu_ids) cpu =cpumask_first (cpu_online_mask); - *last_cpu = cpu; +WRITE_ONCE (*last_cpu, cpu);return cpu; }
Greg Kroah-Hartman
maintainerPATCH 66/108 ppp: reject claimed-as-LCP but actually malformed packets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit f2aeb7306a898e1cbd03963d376f4b6656ca2b55 ]
Since 'ppp_async_encode()' assumes valid LCP packets (with code from 1 to 7 inclusive), add 'ppp_check_packet()' to ensure that LCP packet has an actual body beyond PPP_LCP header bytes, and reject claimed-as-LCP but actually malformed data otherwise.
--- drivers/net/ppp/ppp_generic.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/ppp/ppp_generic.c +15 -0
@@ -70,6 +70,7 @@#define MPHDRLEN_SSN 4/* ditto with short sequence numbers */ #define PPP_PROTO_LEN 2 +#define PPP_LCP_HDRLEN 4/* * An instance of /dev/ppp can be associated with either a ppp
@@ -489,6 +490,15 @@ static ssize_t ppp_read(struct file *file, char __user *buf,return ret; } +static bool ppp_check_packet (struct sk_buff *skb,size_t count) +{ +/* LCP packets must include LCP header which 4 bytes long: +* 1-byte code, 1-byte identifier, and 2-byte length. +*/ +return get_unaligned_be16 (skb->data) !=PPP_LCP || + count >=PPP_PROTO_LEN +PPP_LCP_HDRLEN ; +} +static ssize_t ppp_write (struct file *file,const char __user *buf,size_t count,loff_t *ppos) {
@@ -511,6 +521,11 @@ static ssize_t ppp_write(struct file *file, const char __user *buf,kfree_skb (skb); goto out; } + ret = -EINVAL ; +if (unlikely (!ppp_check_packet (skb, count))) { +kfree_skb (skb); + goto out; + }switch (pf->kind) {case INTERFACE :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 93/108 wireguard: send: annotate intentional data race in checking empty queue
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
commit 381a7d453fa2ac5f854a154d3c9b1bbb90c4f94f upstream.
KCSAN reports a race in wg_packet_send_keepalive, which is intentional:
BUG: KCSAN: data-race in wg_packet_send_keepalive / wg_packet_send_staged_packets
write to 0xffff88814cd91280 of 8 bytes by task 3194 on cpu 0:
__skb_queue_head_init include/linux/skbuff.h:2162 [inline]
skb_queue_splice_init include/linux/skbuff.h:2248 [inline]
wg_packet_send_staged_packets+0xe5/0xad0 drivers/net/wireguard/send.c:351
wg_xmit+0x5b8/0x660 drivers/net/wireguard/device.c:218
__netdev_start_xmit include/linux/netdevice.h:4940 [inline]
netdev_start_xmit include/linux/netdevice.h:4954 [inline]
xmit_one net/core/dev.c:3548 [inline]
dev_hard_start_xmit+0x11b/0x3f0 net/core/dev.c:3564
__dev_queue_xmit+0xeff/0x1d80 net/core/dev.c:4349
dev_queue_xmit include/linux/netdevice.h:3134 [inline]
neigh_connected_output+0x231/0x2a0 net/core/neighbour.c:1592
neigh_output include/net/neighbour.h:542 [inline]
ip6_finish_output2+0xa66/0xce0 net/ipv6/ip6_output.c:137
ip6_finish_output+0x1a5/0x490 net/ipv6/ip6_output.c:222
NF_HOOK_COND include/linux/netfilter.h:303 [inline]
ip6_output+0xeb/0x220 net/ipv6/ip6_output.c:243
dst_output include/net/dst.h:451 [inline]
NF_HOOK include/linux/netfilter.h:314 [inline]
ndisc_send_skb+0x4a2/0x670 net/ipv6/ndisc.c:509
ndisc_send_rs+0x3ab/0x3e0 net/ipv6/ndisc.c:719
addrconf_dad_completed+0x640/0x8e0 net/ipv6/addrconf.c:4295
addrconf_dad_work+0x891/0xbc0
process_one_work kernel/workqueue.c:2633 [inline]
process_scheduled_works+0x5b8/0xa30 kernel/workqueue.c:2706
worker_thread+0x525/0x730 kernel/workqueue.c:2787
kthread+0x1d7/0x210 kernel/kthread.c:388
ret_from_fork+0x48/0x60 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:242
read to 0xffff88814cd91280 of 8 bytes by task 3202 on cpu 1:
skb_queue_empty include/linux/skbuff.h:1798 [inline]
wg_packet_send_keepalive+0x20/0x100 drivers/net/wireguard/send.c:225
wg_receive_handshake_packet drivers/net/wireguard/receive.c:186 [inline]
wg_packet_handshake_receive_worker+0x445/0x5e0 drivers/net/wireguard/receive.c:213
process_one_work kernel/workqueue.c:2633 [inline]
process_scheduled_works+0x5b8/0xa30 kernel/workqueue.c:2706
worker_thread+0x525/0x730 kernel/workqueue.c:2787
kthread+0x1d7/0x210 kernel/kthread.c:388
ret_from_fork+0x48/0x60 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:242
value changed: 0xffff888148fef200 -> 0xffff88814cd91280Mark this race as intentional by using the skb_queue_empty_lockless() function rather than skb_queue_empty(), which uses READ_ONCE() internally to annotate the race.
--- drivers/net/wireguard/send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireguard/send.c +1 -1
@@ -222,7 +222,7 @@ void wg_packet_send_keepalive(struct wg_ {struct sk_buff *skb; -if (skb_queue_empty (&peer->staged_packet_queue)) { +if (skb_queue_empty_lockless (&peer->staged_packet_queue)) { skb =alloc_skb (DATA_PACKET_HEAD_ROOM +MESSAGE_MINIMUM_LENGTH ,GFP_ATOMIC );if (unlikely (!skb))
Greg Kroah-Hartman
maintainerPATCH 94/108 x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jim Mattson <[email protected]>
The linux-5.10-y backport of commit b377c66ae350 ("x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk") misplaced the new NOENDBR annotation, repeating the annotation on __x86_return_thunk, rather than adding the annotation to the !CONFIG_CPU_SRSO version of srso_alias_untrain_ret, as intended.
Move the annotation to the right place.
--- arch/x86/lib/retpoline.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/retpoline.S +1 -1
@@ -105,6 +105,7 @@ __EXPORT_THUNK(srso_alias_untrain_ret) /* dummy definition for alternatives */ SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) ANNOTATE_UNRET_SAFE + ANNOTATE_NOENDBR ret int3 SYM_FUNC_END(srso_alias_untrain_ret)
@@ -258,7 +259,6 @@ SYM_CODE_START(__x86_return_thunk) UNWIND_HINT_FUNC ANNOTATE_NOENDBR ANNOTATE_UNRET_SAFE - ANNOTATE_NOENDBR ret int3 SYM_CODE_END(__x86_return_thunk)
Greg Kroah-Hartman
maintainerPATCH 95/108 efi: ia64: move IA64-only declarations to new asm/efi.h header
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
commit 8ff059b8531f3b98e14f0461859fc7cdd95823e4 upstream.
Move some EFI related declarations that are only referenced on IA64 to a new asm/efi.h arch header.
--- arch/ia64/include/asm/efi.h | 13 +++++++++++++ arch/ia64/kernel/efi.c | 1 + arch/ia64/kernel/machine_kexec.c | 1 + arch/ia64/kernel/mca.c | 1 + arch/ia64/kernel/smpboot.c | 1 + arch/ia64/kernel/time.c | 1 + arch/ia64/kernel/uncached.c | 4 +--- arch/ia64/mm/contig.c | 1 + arch/ia64/mm/discontig.c | 1 + arch/ia64/mm/init.c | 1 + include/linux/efi.h | 6 ------ 11 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 arch/ia64/include/asm/efi.h
arch/ia64/include/asm/efi.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_EFI_H +#define _ASM_EFI_H + +typedef int (*efi_freemem_callback_t ) (u64 start,u64 end,void *arg); + +void *efi_get_pal_addr (void ); +void efi_map_pal_code (void ); +void efi_memmap_walk (efi_freemem_callback_t ,void *); +void efi_memmap_walk_uc (efi_freemem_callback_t ,void *); +void efi_gettimeofday (struct timespec64 *ts); + +#endif
arch/ia64/kernel/efi.c +1 -0
@@ -34,6 +34,7 @@#include <linux/kexec.h> #include <linux/mm.h> +#include <asm/efi.h> #include <asm/io.h> #include <asm/kregs.h> #include <asm/meminit.h>
arch/ia64/kernel/machine_kexec.c +1 -0
@@ -16,6 +16,7 @@#include <linux/numa.h> #include <linux/mmzone.h> +#include <asm/efi.h> #include <asm/numa.h> #include <asm/mmu_context.h> #include <asm/setup.h>
arch/ia64/kernel/mca.c +1 -0
@@ -91,6 +91,7 @@#include <linux/gfp.h> #include <asm/delay.h> +#include <asm/efi.h> #include <asm/meminit.h> #include <asm/page.h> #include <asm/ptrace.h>
arch/ia64/kernel/smpboot.c +1 -0
@@ -45,6 +45,7 @@#include <asm/cache.h> #include <asm/current.h> #include <asm/delay.h> +#include <asm/efi.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/mca.h>
arch/ia64/kernel/time.c +1 -0
@@ -26,6 +26,7 @@#include <linux/sched/cputime.h> #include <asm/delay.h> +#include <asm/efi.h> #include <asm/hw_irq.h> #include <asm/ptrace.h> #include <asm/sal.h>
arch/ia64/kernel/uncached.c +1 -3
@@ -20,14 +20,12 @@#include <linux/genalloc.h> #include <linux/gfp.h> #include <linux/pgtable.h> +#include <asm/efi.h> #include <asm/page.h> #include <asm/pal.h> #include <linux/atomic.h> #include <asm/tlbflush.h> - -extern void __init efi_memmap_walk_uc (efi_freemem_callback_t ,void *); -struct uncached_pool {struct gen_pool *pool;struct mutex add_chunk_mutex;/* serialize adding a converted chunk */
arch/ia64/mm/contig.c +1 -0
@@ -20,6 +20,7 @@#include <linux/nmi.h> #include <linux/swap.h> +#include <asm/efi.h> #include <asm/meminit.h> #include <asm/sections.h> #include <asm/mca.h>
arch/ia64/mm/discontig.c +1 -0
@@ -24,6 +24,7 @@#include <linux/efi.h> #include <linux/nodemask.h> #include <linux/slab.h> +#include <asm/efi.h> #include <asm/tlb.h> #include <asm/meminit.h> #include <asm/numa.h>
arch/ia64/mm/init.c +1 -0
@@ -27,6 +27,7 @@#include <linux/swiotlb.h> #include <asm/dma.h> +#include <asm/efi.h> #include <asm/io.h> #include <asm/numa.h> #include <asm/patch.h>
include/linux/efi.h +0 -6
@@ -171,8 +171,6 @@ int efi_capsule_setup_info(struct capsul size_t hdr_bytes);int __efi_capsule_setup_info (struct capsule_info *cap_info); -typedef int (*efi_freemem_callback_t ) (u64 start,u64 end,void *arg); -/* * Types and defines for Time Services */
@@ -609,10 +607,6 @@ efi_guid_to_str(efi_guid_t *guid, char * }extern void efi_init (void ); -extern void *efi_get_pal_addr (void ); -extern void efi_map_pal_code (void ); -extern void efi_memmap_walk (efi_freemem_callback_t callback,void *arg); -extern void efi_gettimeofday (struct timespec64 *ts);#ifdef CONFIG_EFI extern void efi_enter_virtual_mode (void );/* switch EFI to virtual mode, if possible */ #else
Greg Kroah-Hartman
maintainerPATCH 67/108 ethtool: netlink: do not return SQI value if link is down
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
[ Upstream commit c184cf94e73b04ff7048d045f5413899bc664788 ]
Do not attach SQI value if link is down. "SQI values are only valid if link-up condition is present" per OpenAlliance specification of 100Base-T1 Interoperability Test suite [1]. The same rule would apply for other link types.
[1] https://opensig.org/automotive-ethernet-specifications/#
--- net/ethtool/linkstate.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-)
net/ethtool/linkstate.c +28 -13
@@ -36,6 +36,8 @@ static int linkstate_get_sqi(struct net_device *dev)mutex_lock (&phydev->lock);if (!phydev->drv || !phydev->drv->get_sqi) ret = -EOPNOTSUPP ; +else if (!phydev->link) + ret = -ENETDOWN ;else ret = phydev->drv->get_sqi (phydev);mutex_unlock (&phydev->lock);
@@ -54,6 +56,8 @@ static int linkstate_get_sqi_max(struct net_device *dev)mutex_lock (&phydev->lock);if (!phydev->drv || !phydev->drv->get_sqi_max) ret = -EOPNOTSUPP ; +else if (!phydev->link) + ret = -ENETDOWN ;else ret = phydev->drv->get_sqi_max (phydev);mutex_unlock (&phydev->lock);
@@ -61,6 +65,17 @@ static int linkstate_get_sqi_max(struct net_device *dev)return ret; }; +static bool linkstate_sqi_critical_error (int sqi) +{ +return sqi <0 && sqi != -EOPNOTSUPP && sqi != -ENETDOWN ; +} + +static bool linkstate_sqi_valid (struct linkstate_reply_data *data) +{ +return data->sqi >=0 && data->sqi_max >=0 && + data->sqi <= data->sqi_max; +} +static int linkstate_get_link_ext_state (struct net_device *dev,struct linkstate_reply_data *data) {
@@ -92,12 +107,12 @@ static int linkstate_prepare_data(const struct ethnl_req_info *req_base, data->link =__ethtool_get_link (dev); ret =linkstate_get_sqi (dev); -if (ret <0 && ret != -EOPNOTSUPP ) +if (linkstate_sqi_critical_error (ret)) goto out; data->sqi = ret; ret =linkstate_get_sqi_max (dev); -if (ret <0 && ret != -EOPNOTSUPP ) +if (linkstate_sqi_critical_error (ret)) goto out; data->sqi_max = ret;
@@ -122,11 +137,10 @@ static int linkstate_reply_size(const struct ethnl_req_info *req_base, len =nla_total_size (sizeof (u8))/* LINKSTATE_LINK */ +0 ; -if (data->sqi != -EOPNOTSUPP ) - len +=nla_total_size (sizeof (u32)); - -if (data->sqi_max != -EOPNOTSUPP ) - len +=nla_total_size (sizeof (u32)); +if (linkstate_sqi_valid (data)) { + len +=nla_total_size (sizeof (u32));/* LINKSTATE_SQI */ + len +=nla_total_size (sizeof (u32));/* LINKSTATE_SQI_MAX */ + }if (data->link_ext_state_provided) len +=nla_total_size (sizeof (u8));/* LINKSTATE_EXT_STATE */
@@ -147,13 +161,14 @@ static int linkstate_fill_reply(struct sk_buff *skb, nla_put_u8(skb, ETHTOOL_A_LINKSTATE_LINK, !!data->link))return -EMSGSIZE ; -if (data->sqi != -EOPNOTSUPP && -nla_put_u32 (skb,ETHTOOL_A_LINKSTATE_SQI , data->sqi)) -return -EMSGSIZE ; +if (linkstate_sqi_valid (data)) { +if (nla_put_u32 (skb,ETHTOOL_A_LINKSTATE_SQI , data->sqi)) +return -EMSGSIZE ; -if (data->sqi_max != -EOPNOTSUPP && -nla_put_u32 (skb,ETHTOOL_A_LINKSTATE_SQI_MAX , data->sqi_max)) -return -EMSGSIZE ; +if (nla_put_u32 (skb,ETHTOOL_A_LINKSTATE_SQI_MAX , + data->sqi_max)) +return -EMSGSIZE ; + }if (data->link_ext_state_provided) { if (nla_put_u8(skb, ETHTOOL_A_LINKSTATE_EXT_STATE,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 68/108 udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port().
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 5c0b485a8c6116516f33925b9ce5b6104a6eadfd ]
syzkaller triggered the warning [0] in udp_v4_early_demux().
In udp_v[46]_early_demux() and sk_lookup(), we do not touch the refcount of the looked-up sk and use sock_pfree() as skb->destructor, so we check SOCK_RCU_FREE to ensure that the sk is safe to access during the RCU grace period.
Currently, SOCK_RCU_FREE is flagged for a bound socket after being put into the hash table. Moreover, the SOCK_RCU_FREE check is done too early in udp_v[46]_early_demux() and sk_lookup(), so there could be a small race window:
CPU1 CPU2
---- ----
udp_v4_early_demux() udp_lib_get_port()
| |- hlist_add_head_rcu()
|- sk = __udp4_lib_demux_lookup() |
|- DEBUG_NET_WARN_ON_ONCE(sk_is_refcounted(sk));
`- sock_set_flag(sk, SOCK_RCU_FREE)We had the same bug in TCP and fixed it in commit 871019b22d1b ("net:
set SOCK_RCU_FREE before inserting socket into hashtable").
Let's apply the same fix for UDP.
[0]:
WARNING: CPU: 0 PID: 11198 at net/ipv4/udp.c:2599 udp_v4_early_demux+0x481/0xb70 net/ipv4/udp.c:2599 Modules linked in: CPU: 0 PID: 11198 Comm: syz-executor.1 Not tainted 6.9.0-g93bda33046e7 #13 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 RIP: 0010:udp_v4_early_demux+0x481/0xb70 net/ipv4/udp.c:2599 Code: c5 7a 15 fe bb 01 00 00 00 44 89 e9 31 ff d3 e3 81 e3 bf ef ff ff 89 de e8 2c 74 15 fe 85 db 0f 85 02 06 00 00 e8 9f 7a 15 fe <0f> 0b e8 98 7a 15 fe 49 8d 7e 60 e8 4f 39 2f fe 49 c7 46 60 20 52 RSP: 0018:ffffc9000ce3fa58 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffff8318c92c RDX: ffff888036ccde00 RSI: ffffffff8318c2f1 RDI: 0000000000000001 RBP: ffff88805a2dd6e0 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0001ffffffffffff R12: ffff88805a2dd680 R13: 0000000000000007 R14: ffff88800923f900 R15: ffff88805456004e FS: 00007fc449127640(0000) GS:ffff88807dc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fc449126e38 CR3: 000000003de4b002 CR4: 0000000000770ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000600 PKRU: 55555554 Call Trace: <TASK> ip_rcv_finish_core.constprop.0+0xbdd/0xd20 net/ipv4/ip_input.c:349 ip_rcv_finish+0xda/0x150 net/ipv4/ip_input.c:447 NF_HOOK include/linux/netfilter.h:314 [inline] NF_HOOK include/linux/netfilter.h:308 [inline] ip_rcv+0x16c/0x180 net/ipv4/ip_input.c:569 __netif_receive_skb_one_core+0xb3/0xe0 net/core/dev.c:5624 __netif_receive_skb+0x21/0xd0 net/core/dev.c:5738 netif_receive_skb_internal net/core/dev.c:5824 [inline] netif_receive_skb+0x271/0x300 net/core/dev.c:5884 tun_rx_batched drivers/net/tun.c:1549 [inline] tun_get_user+0x24db/0x2c50 drivers/net/tun.c:2002 tun_chr_write_iter+0x107/0x1a0 drivers/net/tun.c:2048 new_sync_write fs/read_write.c:497 [inline] vfs_write+0x76f/0x8d0 fs/read_write.c:590 ksys_write+0xbf/0x190 fs/read_write.c:643 __do_sys_write fs/read_write.c:655 [inline] __se_sys_write fs/read_write.c:652 [inline] __x64_sys_write+0x41/0x50 fs/read_write.c:652 x64_sys_call+0xe66/0x1990 arch/x86/include/generated/asm/syscalls_64.h:2 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x4b/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x4b/0x53 RIP: 0033:0x7fc44a68bc1f Code: 89 54 24 18 48 89 74 24 10 89 7c 24 08 e8 e9 cf f5 ff 48 8b 54 24 18 48 8b 74 24 10 41 89 c0 8b 7c 24 08 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 31 44 89 c7 48 89 44 24 08 e8 3c d0 f5 ff 48 RSP: 002b:00007fc449126c90 EFLAGS: 00000293 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 00000000004bc050 RCX: 00007fc44a68bc1f RDX: 0000000000000032 RSI: 00000000200000c0 RDI: 00000000000000c8 RBP: 00000000004bc050 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000032 R11: 0000000000000293 R12: 0000000000000000 R13: 000000000000000b R14: 00007fc44a5ec530 R15: 0000000000000000 </TASK>
--- net/ipv4/udp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/udp.c +3 -1
@@ -317,6 +317,8 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum, goto fail_unlock; } +sock_set_flag (sk,SOCK_RCU_FREE ); +sk_add_node_rcu (sk, &hslot->head); hslot->count++;sock_prot_inuse_add (sock_net (sk), sk->sk_prot,1 );
@@ -333,7 +335,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum, hslot2->count++;spin_unlock (&hslot2->lock); } -sock_set_flag (sk,SOCK_RCU_FREE ); + error =0 ; fail_unlock:spin_unlock_bh (&hslot->lock);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 69/108 net/sched: Fix UAF when resolving a clash
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengen Du <[email protected]>
[ Upstream commit 26488172b0292bed837b95a006a3f3431d1898c3 ]
KASAN reports the following UAF:
BUG: KASAN: slab-use-after-free in tcf_ct_flow_table_process_conn+0x12b/0x380 [act_ct] Read of size 1 at addr ffff888c07603600 by task handler130/6469 Call Trace: <IRQ> dump_stack_lvl+0x48/0x70 print_address_description.constprop.0+0x33/0x3d0 print_report+0xc0/0x2b0 kasan_report+0xd0/0x120 __asan_load1+0x6c/0x80 tcf_ct_flow_table_process_conn+0x12b/0x380 [act_ct] tcf_ct_act+0x886/0x1350 [act_ct] tcf_action_exec+0xf8/0x1f0 fl_classify+0x355/0x360 [cls_flower] __tcf_classify+0x1fd/0x330 tcf_classify+0x21c/0x3c0 sch_handle_ingress.constprop.0+0x2c5/0x500 __netif_receive_skb_core.constprop.0+0xb25/0x1510 __netif_receive_skb_list_core+0x220/0x4c0 netif_receive_skb_list_internal+0x446/0x620 napi_complete_done+0x157/0x3d0 gro_cell_poll+0xcf/0x100 __napi_poll+0x65/0x310 net_rx_action+0x30c/0x5c0 __do_softirq+0x14f/0x491 __irq_exit_rcu+0x82/0xc0 irq_exit_rcu+0xe/0x20 common_interrupt+0xa1/0xb0 </IRQ> <TASK> asm_common_interrupt+0x27/0x40 Allocated by task 6469: kasan_save_stack+0x38/0x70 kasan_set_track+0x25/0x40 kasan_save_alloc_info+0x1e/0x40 __kasan_krealloc+0x133/0x190 krealloc+0xaa/0x130 nf_ct_ext_add+0xed/0x230 [nf_conntrack] tcf_ct_act+0x1095/0x1350 [act_ct] tcf_action_exec+0xf8/0x1f0 fl_classify+0x355/0x360 [cls_flower] __tcf_classify+0x1fd/0x330 tcf_classify+0x21c/0x3c0 sch_handle_ingress.constprop.0+0x2c5/0x500 __netif_receive_skb_core.constprop.0+0xb25/0x1510 __netif_receive_skb_list_core+0x220/0x4c0 netif_receive_skb_list_internal+0x446/0x620 napi_complete_done+0x157/0x3d0 gro_cell_poll+0xcf/0x100 __napi_poll+0x65/0x310 net_rx_action+0x30c/0x5c0 __do_softirq+0x14f/0x491 Freed by task 6469: kasan_save_stack+0x38/0x70 kasan_set_track+0x25/0x40 kasan_save_free_info+0x2b/0x60 ____kasan_slab_free+0x180/0x1f0 __kasan_slab_free+0x12/0x30 slab_free_freelist_hook+0xd2/0x1a0 __kmem_cache_free+0x1a2/0x2f0 kfree+0x78/0x120 nf_conntrack_free+0x74/0x130 [nf_conntrack] nf_ct_destroy+0xb2/0x140 [nf_conntrack] __nf_ct_resolve_clash+0x529/0x5d0 [nf_conntrack] nf_ct_resolve_clash+0xf6/0x490 [nf_conntrack] __nf_conntrack_confirm+0x2c6/0x770 [nf_conntrack] tcf_ct_act+0x12ad/0x1350 [act_ct] tcf_action_exec+0xf8/0x1f0 fl_classify+0x355/0x360 [cls_flower] __tcf_classify+0x1fd/0x330 tcf_classify+0x21c/0x3c0 sch_handle_ingress.constprop.0+0x2c5/0x500 __netif_receive_skb_core.constprop.0+0xb25/0x1510 __netif_receive_skb_list_core+0x220/0x4c0 netif_receive_skb_list_internal+0x446/0x620 napi_complete_done+0x157/0x3d0 gro_cell_poll+0xcf/0x100 __napi_poll+0x65/0x310 net_rx_action+0x30c/0x5c0 __do_softirq+0x14f/0x491
The ct may be dropped if a clash has been resolved but is still passed to the tcf_ct_flow_table_process_conn function for further usage. This issue can be fixed by retrieving ct from skb again after confirming conntrack.
--- net/sched/act_ct.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/sched/act_ct.c +8 -0
@@ -1038,6 +1038,14 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,*/ if (nf_conntrack_confirm (skb) !=NF_ACCEPT ) goto drop; + +/* The ct may be dropped if a clash has been resolved, +* so it's necessary to retrieve it from skb again to +* prevent UAF. +*/ + ct =nf_ct_get (skb, &ctinfo); +if (!ct) + skip_add = true; }if (!skip_add)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 70/108 s390: Mark psw in __load_psw_mask() as __unitialized
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Schnelle <[email protected]>
[ Upstream commit 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 ]
Without __unitialized, the following code is generated when INIT_STACK_ALL_ZERO is enabled:
86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) 8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) 92: c0 10 00 00 00 08 larl %r1, 0xa2 98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) 9e: b2 b2 f0 a0 lpswe 160(%r15)
The xc is not adding any security because psw is fully initialized with the following instructions. Add __unitialized to the psw definitiation to avoid the superfluous clearing of psw.
--- arch/s390/include/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/include/asm/processor.h +1 -1
@@ -252,8 +252,8 @@ static inline void __load_psw(psw_t psw)*/ static __always_inline void __load_psw_mask(unsigned long mask) { + psw_t psw __uninitialized;unsigned long addr; -psw_t psw; psw.mask = mask;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 71/108 ARM: davinci: Convert comma to semicolon
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit acc3815db1a02d654fbc19726ceaadca0d7dd81c ]
Replace a comma between expression statements by a semicolon.
--- arch/arm/mach-davinci/pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-davinci/pm.c +1 -1
@@ -62,7 +62,7 @@ static void davinci_pm_suspend(void)/* Configure sleep count in deep sleep register */ val =__raw_readl (pm_config.deepsleep_reg); - val &= ~DEEPSLEEP_SLEEPCOUNT_MASK , + val &= ~DEEPSLEEP_SLEEPCOUNT_MASK ; val |= pm_config.sleepcount;__raw_writel (val, pm_config.deepsleep_reg);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 72/108 octeontx2-af: fix detection of IP layer
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Mazur <[email protected]>
[ Upstream commit 404dc0fd6fb0bb942b18008c6f8c0320b80aca20 ]
Checksum and length checks are not enabled for IPv4 header with options and IPv6 with extension headers.
To fix this a change in enum npc_kpu_lc_ltype is required which will allow adjustment of LTYPE_MASK to detect all types of IP headers.
--- drivers/net/ethernet/marvell/octeontx2/af/npc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/npc.h +6 -2
@@ -54,8 +54,13 @@ enum npc_kpu_lb_ltype { NPC_LT_LB_CUSTOM1 = 0xF, }; +/* Don't modify ltypes up to IP6_EXT, otherwise length and checksum of IP +* headers may not be checked correctly. IPv4 ltypes and IPv6 ltypes must +* differ only at bit 0 so mask 0xE can be used to detect extended headers. +*/ enum npc_kpu_lc_ltype { -NPC_LT_LC_IP =1 , +NPC_LT_LC_PTP =1 , +NPC_LT_LC_IP ,NPC_LT_LC_IP_OPT ,NPC_LT_LC_IP6 ,NPC_LT_LC_IP6_EXT ,
@@ -63,7 +68,6 @@ enum npc_kpu_lc_ltype {NPC_LT_LC_RARP ,NPC_LT_LC_MPLS ,NPC_LT_LC_NSH , -NPC_LT_LC_PTP ,NPC_LT_LC_FCOE ,NPC_LT_LC_CUSTOM0 =0xE , NPC_LT_LC_CUSTOM1 = 0xF,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/108 octeontx2-af: Fix incorrect value output on error path in rvu_check_rsrc_availability()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit 442e26af9aa8115c96541026cbfeaaa76c85d178 ]
In rvu_check_rsrc_availability() in case of invalid SSOW req, an incorrect data is printed to error log. 'req->sso' value is printed instead of 'req->ssow'. Looks like "copy-paste" mistake.
Fix this mistake by replacing 'req->sso' with 'req->ssow'.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +1 -1
@@ -1357,7 +1357,7 @@ static int rvu_check_rsrc_availability(struct rvu *rvu,if (req->ssow > block->lf.max) {dev_err (&rvu->pdev->dev,"Func 0x%x: Invalid SSOW req, %d > max %d\n" , - pcifunc, req->sso, block->lf.max); + pcifunc, req->ssow, block->lf.max);return -EINVAL ; } mappedlfs =rvu_get_rsrc_mapcount (pfvf, block->addr);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 97/108 ipv6: prevent NULL dereference in ip6_output()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 4db783d68b9b39a411a96096c10828ff5dfada7a upstream.
According to syzbot, there is a chance that ip6_dst_idev() returns NULL in ip6_output(). Most places in IPv6 stack deal with a NULL idev just fine, but not here.
syzbot reported:
general protection fault, probably for non-canonical address 0xdffffc00000000bc: 0000 [#1] PREEMPT SMP KASAN PTI KASAN: null-ptr-deref in range [0x00000000000005e0-0x00000000000005e7] CPU: 0 PID: 9775 Comm: syz-executor.4 Not tainted 6.9.0-rc5-syzkaller-00157-g6a30653b604a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024 RIP: 0010:ip6_output+0x231/0x3f0 net/ipv6/ip6_output.c:237 Code: 3c 1e 00 49 89 df 74 08 4c 89 ef e8 19 58 db f7 48 8b 44 24 20 49 89 45 00 49 89 c5 48 8d 9d e0 05 00 00 48 89 d8 48 c1 e8 03 <42> 0f b6 04 38 84 c0 4c 8b 74 24 28 0f 85 61 01 00 00 8b 1b 31 ff RSP: 0018:ffffc9000927f0d8 EFLAGS: 00010202 RAX: 00000000000000bc RBX: 00000000000005e0 RCX: 0000000000040000 RDX: ffffc900131f9000 RSI: 0000000000004f47 RDI: 0000000000004f48 RBP: 0000000000000000 R08: ffffffff8a1f0b9a R09: 1ffffffff1f51fad R10: dffffc0000000000 R11: fffffbfff1f51fae R12: ffff8880293ec8c0 R13: ffff88805d7fc000 R14: 1ffff1100527d91a R15: dffffc0000000000 FS: 00007f135c6856c0(0000) GS:ffff8880b9400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000080 CR3: 0000000064096000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> NF_HOOK include/linux/netfilter.h:314 [inline] ip6_xmit+0xefe/0x17f0 net/ipv6/ip6_output.c:358 sctp_v6_xmit+0x9f2/0x13f0 net/sctp/ipv6.c:248 sctp_packet_transmit+0x26ad/0x2ca0 net/sctp/output.c:653 sctp_packet_singleton+0x22c/0x320 net/sctp/outqueue.c:783 sctp_outq_flush_ctrl net/sctp/outqueue.c:914 [inline] sctp_outq_flush+0x6d5/0x3e20 net/sctp/outqueue.c:1212 sctp_side_effects net/sctp/sm_sideeffect.c:1198 [inline] sctp_do_sm+0x59cc/0x60c0 net/sctp/sm_sideeffect.c:1169 sctp_primitive_ASSOCIATE+0x95/0xc0 net/sctp/primitive.c:73 __sctp_connect+0x9cd/0xe30 net/sctp/socket.c:1234 sctp_connect net/sctp/socket.c:4819 [inline] sctp_inet_connect+0x149/0x1f0 net/sctp/socket.c:4834 __sys_connect_file net/socket.c:2048 [inline] __sys_connect+0x2df/0x310 net/socket.c:2065 __do_sys_connect net/socket.c:2075 [inline] __se_sys_connect net/socket.c:2072 [inline] __x64_sys_connect+0x7a/0x90 net/socket.c:2072 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- net/ipv6/ip6_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_output.c +1 -1
@@ -240,7 +240,7 @@ int ip6_output(struct net *net, struct s skb->protocol =htons (ETH_P_IPV6 ); skb->dev = dev; -if (unlikely (READ_ONCE (idev->cnf.disable_ipv6))) { +if (unlikely (!idev ||READ_ONCE (idev->cnf.disable_ipv6))) {IP6_INC_STATS (net, idev,IPSTATS_MIB_OUTDISCARDS );kfree_skb (skb);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 106/108 i2c: rcar: ensure Gen3+ reset does not disturb local targets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit ea5ea84c9d3570dc06e8fc5ee2273eaa584aa3ac ]
R-Car Gen3+ needs a reset before every controller transfer. That erases configuration of a potentially in parallel running local target instance. To avoid this disruption, avoid controller transfers if a local target is running. Also, disable SMBusHostNotify because it requires being a controller and local target at the same time.
--- drivers/i2c/busses/i2c-rcar.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/i2c/busses/i2c-rcar.c +8 -0
@@ -796,6 +796,10 @@ static int rcar_i2c_do_reset(struct rcar_i2c_priv *priv) {int ret; +/* Don't reset if a slave instance is currently running */ +if (priv->slave) +return -EISCONN ; + ret =reset_control_reset (priv->rstc);if (ret)return ret;
@@ -1027,6 +1031,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)if (of_property_read_bool (dev->of_node,"smbus" )) priv->flags |=ID_P_HOST_NOTIFY ; +/* R-Car Gen3+ needs a reset before every transfer */ if (priv->devtype >=I2C_RCAR_GEN3 ) { priv->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL );if (IS_ERR (priv->rstc))
@@ -1035,6 +1040,9 @@ static int rcar_i2c_probe(struct platform_device *pdev) ret =reset_control_status (priv->rstc);if (ret <0 ) goto out_pm_put; + +/* hard reset disturbs HostNotify local target, so disable it */ + priv->flags &= ~ID_P_HOST_NOTIFY ; } ret =platform_get_irq (pdev,0 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 107/108 i2c: rcar: clear NO_RXDMA flag after resetting
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit fea6b5ebb71a2830b042e42de7ae255017ac3ce8 ]
We should allow RXDMA only if the reset was really successful, so clear the flag after the reset call.
--- drivers/i2c/busses/i2c-rcar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-rcar.c +1 -1
@@ -826,10 +826,10 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,/* Gen3+ needs a reset. That also allows RXDMA once */ if (priv->devtype >=I2C_RCAR_GEN3 ) { - priv->flags &= ~ID_P_NO_RXDMA ; ret =rcar_i2c_do_reset (priv);if (ret) goto out; + priv->flags &= ~ID_P_NO_RXDMA ; }rcar_i2c_init (priv);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 108/108 i2c: rcar: fix error code in probe()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 37a672be3ae357a0f87fbc00897fa7fcb3d7d782 upstream.
Return an error code if devm_reset_control_get_exclusive() fails. The current code returns success.
--- drivers/i2c/busses/i2c-rcar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-rcar.c +3 -1
@@ -1034,8 +1034,10 @@ static int rcar_i2c_probe(struct platfor/* R-Car Gen3+ needs a reset before every transfer */ if (priv->devtype >=I2C_RCAR_GEN3 ) { priv->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL ); -if (IS_ERR (priv->rstc)) +if (IS_ERR (priv->rstc)) { + ret =PTR_ERR (priv->rstc); goto out_pm_put; + } ret =reset_control_status (priv->rstc);if (ret <0 )
Greg Kroah-Hartman
maintainerPATCH 98/108 bpf: Allow reads from uninit stack
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eduard Zingerman <[email protected]>
commit 6715df8d5d24655b9fd368e904028112b54c7de1 upstream.
This commits updates the following functions to allow reads from uninitialized stack locations when env->allow_uninit_stack option is enabled:
- check_stack_read_fixed_off()
- check_stack_range_initialized(), called from:
- check_stack_read_var_off()
- check_helper_mem_access()
Such change allows to relax logic in stacksafe() to treat STACK_MISC and STACK_INVALID in a same way and make the following stack slot configurations equivalent:
| Cached state | Current state | | stack slot | stack slot | |------------------+------------------| | STACK_INVALID or | STACK_INVALID or | | STACK_MISC | STACK_SPILL or | | | STACK_MISC or | | | STACK_ZERO or | | | STACK_DYNPTR |
This leads to significant verification speed gains (see below).
The idea was suggested by Andrii Nakryiko [1] and initial patch was created by Alexei Starovoitov [2].
Currently the env->allow_uninit_stack is allowed for programs loaded by users with CAP_PERFMON or CAP_SYS_ADMIN capabilities.
A number of test cases from verifier/*.c were expecting uninitialized stack access to be an error. These test cases were updated to execute in unprivileged mode (thus preserving the tests).
The test progs/test_global_func10.c expected "invalid indirect read from stack" error message because of the access to uninitialized memory region. This error is no longer possible in privileged mode. The test is updated to provoke an error "invalid indirect access to stack" because of access to invalid stack address (such error is not verified by progs/test_global_func*.c series of tests).
The following tests had to be removed because these can't be made unprivileged:
- verifier/sock.c:
- "sk_storage_get(map, skb->sk, &stack_value, 1): partially init stack_value"
BPF_PROG_TYPE_SCHED_CLS programs are not executed in unprivileged mode.
- verifier/var_off.c:
- "indirect variable-offset stack access, max_off+size > max_initialized"
- "indirect variable-offset stack access, uninitialized" These tests verify that access to uninitialized stack values is detected when stack offset is not a constant. However, variable stack access is prohibited in unprivileged mode, thus these tests are no longer valid.
* * *
Here is veristat log comparing this patch with current master on a set of selftest binaries listed in tools/testing/selftests/bpf/veristat.cfg and cilium BPF binaries (see [3]):
$ ./veristat -e file,prog,states -C -f 'states_pct<-30' master.log current.log File Program States (A) States (B) States (DIFF) -------------------------- -------------------------- ---------- ---------- ---------------- bpf_host.o tail_handle_ipv6_from_host 349 244 -105 (-30.09%) bpf_host.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_lxc.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_sock.o cil_sock4_connect 70 48 -22 (-31.43%) bpf_sock.o cil_sock4_sendmsg 68 46 -22 (-32.35%) bpf_xdp.o tail_handle_nat_fwd_ipv4 1554 803 -751 (-48.33%) bpf_xdp.o tail_lb_ipv4 6457 2473 -3984 (-61.70%) bpf_xdp.o tail_lb_ipv6 7249 3908 -3341 (-46.09%) pyperf600_bpf_loop.bpf.o on_event 287 145 -142 (-49.48%) strobemeta.bpf.o on_event 15915 4772 -11143 (-70.02%) strobemeta_nounroll2.bpf.o on_event 17087 3820 -13267 (-77.64%) xdp_synproxy_kern.bpf.o syncookie_tc 21271 6635 -14636 (-68.81%) xdp_synproxy_kern.bpf.o syncookie_xdp 23122 6024 -17098 (-73.95%) -------------------------- -------------------------- ---------- ---------- ----------------
Note: I limited selection by states_pct<-30%.
Inspection of differences in pyperf600_bpf_loop behavior shows that the following patch for the test removes almost all differences:
- a/tools/testing/selftests/bpf/progs/pyperf.h
+ b/tools/testing/selftests/bpf/progs/pyperf.h
@ -266,8 +266,8 @ int __on_event(struct bpf_raw_tracepoint_args *ctx)
}
if (event->pthread_match || !pidData->use_tls) {
- void* frame_ptr;
- FrameData frame;
+ void* frame_ptr = 0;
+ FrameData frame = {};
Symbol sym = {};
int cur_cpu = bpf_get_smp_processor_id();
W/o this patch the difference comes from the following pattern (for different variables):
static bool get_frame_data(... FrameData *frame ...)
{
...
bpf_probe_read_user(&frame->f_code, ...);
if (!frame->f_code)
return false;
...
bpf_probe_read_user(&frame->co_name, ...);
if (frame->co_name)
...;
}
int __on_event(struct bpf_raw_tracepoint_args *ctx)
{
FrameData frame;
...
get_frame_data(... &frame ...) // indirectly via a bpf_loop & callback
...
}
SEC("raw_tracepoint/kfree_skb")
int on_event(struct bpf_raw_tracepoint_args* ctx)
{
...
ret |= __on_event(ctx);
ret |= __on_event(ctx);
...
}With regards to value frame->co_name the following is important:
- Because of the conditional if (!frame->f_code) each call to __on_event() produces two states, one with frame->co_name marked as STACK_MISC, another with it as is (and marked STACK_INVALID on a first call).
- The call to bpf_probe_read_user() does not mark stack slots corresponding to &frame->co_name as REG_LIVE_WRITTEN but it marks these slots as BPF_MISC, this happens because of the following loop in the check_helper_call():
for (i = 0; i < meta.access_size; i++) {
err = check_mem_access(env, insn_idx, meta.regno, i, BPF_B,
BPF_WRITE, -1, false);
if (err)
return err;
} Note the size of the write, it is a one byte write for each byte touched by a helper. The BPF_B write does not lead to write marks for the target stack slot.
- Which means that w/o this patch when second __on_event() call is verified if (frame->co_name) will propagate read marks first to a stack slot with STACK_MISC marks and second to a stack slot with STACK_INVALID marks and these states would be considered different.
[1] https://lore.kernel.org/bpf/CAEf4BzY3e+ZuC6HUa8dCiUovQRg2SzEk7M-dSkqNZyn=xEmnPA@mail.gmail.com/
[2] https://lore.kernel.org/bpf/CAADnVQKs2i1iuZ5SUGuJtxWVfGYR9kDgYKhq3rNV+kBLQCu7rA@mail.gmail.com/
[3] [email protected]:anakryiko/cilium.git
--- kernel/bpf/verifier.c | 11 tools/testing/selftests/bpf/progs/test_global_func10.c | 31 + tools/testing/selftests/bpf/verifier/calls.c | 13 tools/testing/selftests/bpf/verifier/helper_access_var_len.c | 104 +++-- tools/testing/selftests/bpf/verifier/int_ptr.c | 9 tools/testing/selftests/bpf/verifier/search_pruning.c | 13 tools/testing/selftests/bpf/verifier/sock.c | 27 - tools/testing/selftests/bpf/verifier/spill_fill.c | 211 +++++++++++ tools/testing/selftests/bpf/verifier/var_off.c | 52 -- 9 files changed, 342 insertions(+), 129 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_global_func10.c
kernel/bpf/verifier.c +10 -1
@@ -2807,6 +2807,8 @@ static int check_stack_read_fixed_off(stcontinue ;if (type ==STACK_MISC )continue ; +if (type ==STACK_INVALID && env->allow_uninit_stack) +continue ;verbose (env,"invalid read from stack off %d+%d size %d\n" , off, i, size);return -EACCES ;
@@ -2844,6 +2846,8 @@ static int check_stack_read_fixed_off(stcontinue ;if (type ==STACK_ZERO )continue ; +if (type ==STACK_INVALID && env->allow_uninit_stack) +continue ;verbose (env,"invalid read from stack off %d+%d size %d\n" , off, i, size);return -EACCES ;
@@ -4300,7 +4304,8 @@ static int check_stack_range_initialized stype = &state->stack[spi].slot_type[slot %BPF_REG_SIZE ];if (*stype ==STACK_MISC ) goto mark; -if (*stype ==STACK_ZERO ) { +if ((*stype ==STACK_ZERO ) || + (*stype ==STACK_INVALID && env->allow_uninit_stack)) {if (clobber) {/* helper can write anything into the stack */ *stype =STACK_MISC ;
@@ -9492,6 +9497,10 @@ static bool stacksafe(struct bpf_verifieif (old->stack[spi].slot_type[i %BPF_REG_SIZE ] ==STACK_INVALID )continue ; +if (env->allow_uninit_stack && + old->stack[spi].slot_type[i %BPF_REG_SIZE ] ==STACK_MISC ) +continue ; +/* explored stack has more populated slots than current stack * and these slots were used */
tools/testing/selftests/bpf/progs/test_global_func10.c new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include <stddef.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include "bpf_misc.h" + +struct Small { +long x; +}; + +struct Big { +long x; +long y; +}; + +__noinline int foo(const struct Big *big) +{ +if (!big) +return 0 ; + +return bpf_get_prandom_u32 () < big->y; +} + +SEC("cgroup_skb/ingress") +__failure __msg("invalid indirect access to stack") +int global_func10(struct __sk_buff *skb) +{ +const struct Small small = {.x = skb->len }; + +return foo ((struct Big *)&small) ?1 :0 ; +}
tools/testing/selftests/bpf/verifier/calls.c +8 -5
@@ -1948,19 +1948,22 @@* that fp-8 stack slot was unused in the fall-through * branch and will accept the program incorrectly */ -BPF_JMP_IMM (BPF_JGT ,BPF_REG_1 ,2 ,2 ), +BPF_EMIT_CALL (BPF_FUNC_get_prandom_u32), +BPF_JMP_IMM (BPF_JGT ,BPF_REG_0 ,2 ,2 ),BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,0 ),BPF_JMP_IMM (BPF_JA ,0 ,0 ,0 ),BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_10 ),BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,-8 ),BPF_LD_MAP_FD (BPF_REG_1 ,0 ),BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_map_lookup_elem), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .fixup_map_hash_48b = { 6 }, - .errstr = "invalid indirect read from stack R2 off -8+0 size 8", - .result = REJECT, - .prog_type = BPF_PROG_TYPE_XDP, + .fixup_map_hash_48b = { 7 }, + .errstr_unpriv = "invalid indirect read from stack R2 off -8+0 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "calls: ctx read at start of subprog",
tools/testing/selftests/bpf/verifier/helper_access_var_len.c +69 -35
137 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/int_ptr.c +5 -4
@@ -54,12 +54,13 @@/* bpf_strtoul() */ BPF_EMIT_CALL (BPF_FUNC_strtoul), -BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .result =REJECT , - .prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL, - .errstr = "invalid indirect read from stack R4 off -16+4 size 8", + .result_unpriv =REJECT , + .errstr_unpriv = "invalid indirect read from stack R4 off -16+4 size 8", +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "ARG_PTR_TO_LONG misaligned",
tools/testing/selftests/bpf/verifier/search_pruning.c +8 -5
@@ -128,9 +128,10 @@ BPF_EXIT_INSN(), }, .fixup_map_hash_8b = { 3 }, - .errstr = "invalid read from stack off -16+0 size 8", - .result = REJECT, - .prog_type =BPF_PROG_TYPE_TRACEPOINT , + .errstr_unpriv = "invalid read from stack off -16+0 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result =ACCEPT , }, { "allocated_stack",
@@ -187,6 +188,8 @@ BPF_EXIT_INSN(), }, .flags = BPF_F_TEST_STATE_FREQ, - .errstr = "invalid read from stack off -8+1 size 8", - .result = REJECT, + .errstr_unpriv = "invalid read from stack off -8+1 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, },
tools/testing/selftests/bpf/verifier/sock.c +0 -27
@@ -531,33 +531,6 @@ .result = ACCEPT, }, { - "sk_storage_get(map, skb->sk, &stack_value, 1): partially init stack_value", - .insns = { -BPF_MOV64_IMM (BPF_REG_2 ,0 ), -BPF_STX_MEM (BPF_W ,BPF_REG_10 ,BPF_REG_2 ,-8 ), -BPF_LDX_MEM (BPF_DW ,BPF_REG_1 ,BPF_REG_1 , offsetof(struct __sk_buff , sk)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_1 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_EMIT_CALL (BPF_FUNC_sk_fullsock), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_0 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_MOV64_IMM (BPF_REG_4 ,1 ), -BPF_MOV64_REG (BPF_REG_3 ,BPF_REG_10 ), -BPF_ALU64_IMM (BPF_ADD ,BPF_REG_3 ,-8 ), -BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_0 ), -BPF_LD_MAP_FD (BPF_REG_1 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_sk_storage_get), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), - BPF_EXIT_INSN(), - }, - .fixup_sk_storage_map = { 14 }, - .prog_type = BPF_PROG_TYPE_SCHED_CLS, - .result = REJECT, - .errstr = "invalid indirect read from stack", -}, -{ "bpf_map_lookup_elem(smap, &key)", .insns = { BPF_ST_MEM(BPF_W, BPF_REG_10, -4, 0),
tools/testing/selftests/bpf/verifier/spill_fill.c +211 -0
214 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/var_off.c +0 -52
64 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 99/108 nilfs2: fix kernel bug on rename operation of broken directory
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit a9e1ddc09ca55746079cc479aa3eb6411f0d99d4 upstream.
Syzbot reported that in rename directory operation on broken directory on nilfs2, __block_write_begin_int() called to prepare block write may fail BUG_ON check for access exceeding the folio/page size.
This is because nilfs_dotdot(), which gets parent directory reference entry ("..") of the directory to be moved or renamed, does not check consistency enough, and may return location exceeding folio/page size for broken directories.
Fix this issue by checking required directory entries ("." and "..") in the first chunk of the directory in nilfs_dotdot().
--- fs/nilfs2/dir.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
fs/nilfs2/dir.c +30 -2
@@ -396,11 +396,39 @@ found:struct nilfs_dir_entry *nilfs_dotdot (struct inode *dir,struct page **p) { -struct nilfs_dir_entry *de =nilfs_get_page (dir,0 , p); +struct page *page; +struct nilfs_dir_entry *de, *next_de; +size_t limit; +char *msg; + de =nilfs_get_page (dir,0 , &page);if (IS_ERR (de))return NULL ; -return nilfs_next_entry (de); + + limit =nilfs_last_byte (dir,0 );/* is a multiple of chunk size */ +if (unlikely (!limit ||le64_to_cpu (de->inode) != dir->i_ino || + !nilfs_match (1 ,"." , de))) { + msg ="missing '.'" ; + goto fail; + } + + next_de =nilfs_next_entry (de); +/* +* If "next_de" has not reached the end of the chunk, there is +* at least one more record. Check whether it matches "..". +*/ +if (unlikely ((char *)next_de == (char *)de +nilfs_chunk_size (dir) || + !nilfs_match (2 ,".." , next_de))) { + msg ="missing '..'" ; + goto fail; + } + *p = page; +return next_de; + +fail: +nilfs_error (dir->i_sb,"directory #%lu %s" , dir->i_ino, msg); +nilfs_put_page (page); +return NULL ; }ino_t nilfs_inode_by_name (struct inode *dir,const struct qstr *qstr)
Greg Kroah-Hartman
maintainerPATCH 100/108 arm64/bpf: Remove 128MB limit for BPF JIT programs
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
commit b89ddf4cca43f1269093942cf5c4e457fd45c335 upstream.
Commit 91fc957c9b1d ("arm64/bpf: don't allocate BPF JIT programs in module memory") restricts BPF JIT program allocation to a 128MB region to ensure BPF programs are still in branching range of each other. However this restriction should not apply to the aarch64 JIT, since BPF_JMP | BPF_CALL are implemented as a 64-bit move into a register and then a BLR instruction - which has the effect of being able to call anything without proximity limitation.
The practical reason to relax this restriction on JIT memory is that 128MB of JIT memory can be quickly exhausted, especially where PAGE_SIZE is 64KB - one page is needed per program. In cases where seccomp filters are applied to multiple VMs on VM launch - such filters are classic BPF but converted to BPF - this can severely limit the number of VMs that can be launched. In a world where we support BPF JIT always on, turning off the JIT isn't always an option either.
--- arch/arm64/include/asm/extable.h | 9 --------- arch/arm64/include/asm/memory.h | 5 +---- arch/arm64/kernel/traps.c | 2 +- arch/arm64/mm/extable.c | 3 ++- arch/arm64/mm/ptdump.c | 2 -- arch/arm64/net/bpf_jit_comp.c | 7 ++----- 6 files changed, 6 insertions(+), 22 deletions(-)
arch/arm64/include/asm/extable.h +0 -9
@@ -22,15 +22,6 @@ struct exception_table_entry#define ARCH_HAS_RELATIVE_EXTABLE -static inline bool in_bpf_jit (struct pt_regs *regs) -{ -if (!IS_ENABLED (CONFIG_BPF_JIT )) -return false; - -return regs->pc >=BPF_JIT_REGION_START && - regs->pc <BPF_JIT_REGION_END ; -} -#ifdef CONFIG_BPF_JIT int arm64_bpf_fixup_exception (const struct exception_table_entry *ex,struct pt_regs *regs);
arch/arm64/include/asm/memory.h +1 -4
@@ -44,11 +44,8 @@#define _PAGE_OFFSET (va) (-(UL(1) << (va)))#define PAGE_OFFSET (_PAGE_OFFSET(VA_BITS))#define KIMAGE_VADDR (MODULES_END) -#define BPF_JIT_REGION_START (KASAN_SHADOW_END) -#define BPF_JIT_REGION_SIZE (SZ_128M) -#define BPF_JIT_REGION_END (BPF_JIT_REGION_START + BPF_JIT_REGION_SIZE)#define MODULES_END (MODULES_VADDR + MODULES_VSIZE) -#define MODULES_VADDR (BPF_JIT_REGION_END) +#define MODULES_VADDR (_PAGE_END(VA_BITS_MIN))#define MODULES_VSIZE (SZ_128M)#define VMEMMAP_START (-VMEMMAP_SIZE - SZ_2M)#define VMEMMAP_END (VMEMMAP_START + VMEMMAP_SIZE)
arch/arm64/kernel/traps.c +1 -1
@@ -912,7 +912,7 @@ static struct break_hook bug_break_hookstatic int reserved_fault_handler (struct pt_regs *regs,unsigned int esr) {pr_err ("%s generated an invalid instruction at %pS!\n" , -in_bpf_jit (regs) ?"BPF JIT" :"Kernel text patching" , +"Kernel text patching" , (void *)instruction_pointer (regs));/* We cannot handle this */
arch/arm64/mm/extable.c +2 -1
@@ -5,6 +5,7 @@#include <linux/extable.h> #include <linux/uaccess.h> +#include <linux/filter.h> int fixup_exception (struct pt_regs *regs) {
@@ -14,7 +15,7 @@ int fixup_exception(struct pt_regs *regsif (!fixup)return 0 ; -if (in_bpf_jit (regs)) +if (is_bpf_text_address (regs->pc))return arm64_bpf_fixup_exception (fixup, regs); regs->pc = (unsigned long )&fixup->fixup + fixup->fixup;
arch/arm64/mm/ptdump.c +0 -2
@@ -41,8 +41,6 @@ static struct addr_marker address_marker { 0 /* KASAN_SHADOW_START */, "Kasan shadow start" }, { KASAN_SHADOW_END, "Kasan shadow end" }, #endif - { BPF_JIT_REGION_START, "BPF start" }, - { BPF_JIT_REGION_END, "BPF end" }, { MODULES_VADDR, "Modules start" }, { MODULES_END, "Modules end" }, { VMALLOC_START, "vmalloc() area" },
arch/arm64/net/bpf_jit_comp.c +2 -5
@@ -1145,15 +1145,12 @@ out:u64 bpf_jit_alloc_exec_limit (void ) { -return BPF_JIT_REGION_SIZE ; +return VMALLOC_END -VMALLOC_START ; }void *bpf_jit_alloc_exec (unsigned long size) { -return __vmalloc_node_range (size,PAGE_SIZE ,BPF_JIT_REGION_START , -BPF_JIT_REGION_END ,GFP_KERNEL , -PAGE_KERNEL ,0 ,NUMA_NO_NODE , -__builtin_return_address (0 )); +return vmalloc (size); }void bpf_jit_free_exec (void *addr)
Greg Kroah-Hartman
maintainerPATCH 101/108 i2c: rcar: bring hardware to known state when probing
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 4e36c0f20cb1c74c7bd7ea31ba432c1c4a989031 ]
When probing, the hardware is not brought into a known state. This may be a problem when a hypervisor restarts Linux without resetting the hardware, leaving an old state running. Make sure the hardware gets initialized, especially interrupts should be cleared and disabled.
--- drivers/i2c/busses/i2c-rcar.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/i2c/busses/i2c-rcar.c +12 -5
@@ -220,6 +220,14 @@ static void rcar_i2c_init(struct rcar_i2c_priv *priv) } +static void rcar_i2c_reset_slave (struct rcar_i2c_priv *priv) +{ +rcar_i2c_write (priv,ICSIER ,0 ); +rcar_i2c_write (priv,ICSSR ,0 ); +rcar_i2c_write (priv,ICSCR ,SDBS ); +rcar_i2c_write (priv,ICSAR ,0 );/* Gen2: must be 0 if not using slave */ +} +static int rcar_i2c_bus_barrier (struct rcar_i2c_priv *priv) {int ret;
@@ -888,11 +896,8 @@ static int rcar_unreg_slave(struct i2c_client *slave)/* ensure no irq is running before clearing ptr */ disable_irq (priv->irq); -rcar_i2c_write (priv,ICSIER ,0 ); -rcar_i2c_write (priv,ICSSR ,0 ); +rcar_i2c_reset_slave (priv);enable_irq (priv->irq); -rcar_i2c_write (priv,ICSCR ,SDBS ); -rcar_i2c_write (priv,ICSAR ,0 );/* Gen2: must be 0 if not using slave */ priv->slave =NULL ;
@@ -1004,7 +1009,9 @@ static int rcar_i2c_probe(struct platform_device *pdev) goto out_pm_disable; } -rcar_i2c_write (priv,ICSAR ,0 );/* Gen2: must be 0 if not using slave */ +/* Bring hardware to known state */ +rcar_i2c_init (priv); +rcar_i2c_reset_slave (priv);if (priv->devtype <I2C_RCAR_GEN3 ) { irqflags |=IRQF_NO_THREAD ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 102/108 i2c: mark HostNotify target address as used
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit bd9f5348089b65612e5ca976e2ae22f005340331 ]
I2C core handles the local target for receiving HostNotify alerts. There is no separate driver bound to that address. That means userspace can access it if desired, leading to further complications if controllers are not capable of reading their own local target. Bind the local target to the dummy driver so it will be marked as "handled by the kernel" if the HostNotify feature is used. That protects aginst userspace access and prevents other drivers binding to it.
--- drivers/i2c/i2c-core-base.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/i2c-core-base.c +1 -0
@@ -969,6 +969,7 @@ EXPORT_SYMBOL_GPL(i2c_unregister_device);static const struct i2c_device_id dummy_id[] = { {"dummy" ,0 }, + {"smbus_host_notify" ,0 }, { }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 103/108 i2c: rcar: Add R-Car Gen4 support
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit ea01b71b07993d5c518496692f476a3c6b5d9786 ]
Add support for the I2C Bus Interface on R-Car Gen4 SoCs (e.g. R-Car S4-8) by matching on a family-specific compatible value.
While I2C on R-Car Gen4 does support some extra features (Slave Clock Stretch Select), for now it is treated the same as I2C on R-Car Gen3.
Stable-dep-of: ea5ea84c9d35 ("i2c: rcar: ensure Gen3+ reset does not disturb local targets")
--- drivers/i2c/busses/i2c-rcar.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-rcar.c +1 -0
@@ -950,6 +950,7 @@ static const struct of_device_id rcar_i2c_dt_ids[] = { { .compatible = "renesas,rcar-gen1-i2c", .data = (void *)I2C_RCAR_GEN1 }, { .compatible = "renesas,rcar-gen2-i2c", .data = (void *)I2C_RCAR_GEN2 }, { .compatible = "renesas,rcar-gen3-i2c", .data = (void *)I2C_RCAR_GEN3 }, + { .compatible = "renesas,rcar-gen4-i2c", .data = (void *)I2C_RCAR_GEN3 }, {}, };MODULE_DEVICE_TABLE (of, rcar_i2c_dt_ids);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 104/108 i2c: rcar: reset controller is mandatory for Gen3+
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 0e864b552b2302e40b2277629ebac79544a5c433 ]
Initially, we only needed a reset controller to make sure RXDMA works at least once per transfer. Meanwhile, documentation has been updated. It now says that a reset has to be performed prior every transaction, even if it is non-DMA. So, make the reset controller a requirement instead of being optional. And bail out if resetting fails.
Stable-dep-of: ea5ea84c9d35 ("i2c: rcar: ensure Gen3+ reset does not disturb local targets")
--- drivers/i2c/busses/i2c-rcar.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
drivers/i2c/busses/i2c-rcar.c +14 -15
@@ -821,12 +821,10 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,/* Gen3 needs a reset before allowing RXDMA once */ if (priv->devtype ==I2C_RCAR_GEN3 ) { - priv->flags |=ID_P_NO_RXDMA ; -if (!IS_ERR (priv->rstc)) { - ret =rcar_i2c_do_reset (priv); -if (ret ==0 ) - priv->flags &= ~ID_P_NO_RXDMA ; - } + priv->flags &= ~ID_P_NO_RXDMA ; + ret =rcar_i2c_do_reset (priv); +if (ret) + goto out; }rcar_i2c_init (priv);
@@ -1019,15 +1017,6 @@ static int rcar_i2c_probe(struct platform_device *pdev) irqhandler = rcar_i2c_gen2_irq; } -if (priv->devtype ==I2C_RCAR_GEN3 ) { - priv->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL ); -if (!IS_ERR (priv->rstc)) { - ret =reset_control_status (priv->rstc); -if (ret <0 ) - priv->rstc =ERR_PTR (-ENOTSUPP ); - } - } -/* Stay always active when multi-master to keep arbitration working */ if (of_property_read_bool (dev->of_node,"multi-master" )) priv->flags |=ID_P_PM_BLOCKED ;
@@ -1037,6 +1026,16 @@ static int rcar_i2c_probe(struct platform_device *pdev)if (of_property_read_bool (dev->of_node,"smbus" )) priv->flags |=ID_P_HOST_NOTIFY ; +if (priv->devtype ==I2C_RCAR_GEN3 ) { + priv->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL ); +if (IS_ERR (priv->rstc)) + goto out_pm_put; + + ret =reset_control_status (priv->rstc); +if (ret <0 ) + goto out_pm_put; + } + ret =platform_get_irq (pdev,0 );if (ret <0 ) goto out_pm_put;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 105/108 i2c: rcar: introduce Gen4 devices
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 2b523c46e81ebd621515ab47117f95de197dfcbf ]
So far, we treated Gen4 as Gen3. But we are soon adding FM+ as a Gen4 specific feature, so prepare the code for the new devtype.
Stable-dep-of: ea5ea84c9d35 ("i2c: rcar: ensure Gen3+ reset does not disturb local targets")
--- drivers/i2c/busses/i2c-rcar.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-rcar.c +7 -6
@@ -116,6 +116,7 @@ enum rcar_i2c_type {I2C_RCAR_GEN1 ,I2C_RCAR_GEN2 ,I2C_RCAR_GEN3 , + I2C_RCAR_GEN4, }; struct rcar_i2c_priv {
@@ -380,8 +381,8 @@ static void rcar_i2c_dma_unmap(struct rcar_i2c_priv *priv)dma_unmap_single (chan->device->dev,sg_dma_address (&priv->sg),sg_dma_len (&priv->sg), priv->dma_direction); -/* Gen3 can only do one RXDMA per transfer and we just completed it */ -if (priv->devtype ==I2C_RCAR_GEN3 && +/* Gen3+ can only do one RXDMA per transfer and we just completed it */ +if (priv->devtype >=I2C_RCAR_GEN3 && priv->dma_direction ==DMA_FROM_DEVICE ) priv->flags |=ID_P_NO_RXDMA ;
@@ -819,8 +820,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,if (ret <0 ) goto out; -/* Gen3 needs a reset before allowing RXDMA once */ -if (priv->devtype ==I2C_RCAR_GEN3 ) { +/* Gen3+ needs a reset. That also allows RXDMA once */ +if (priv->devtype >=I2C_RCAR_GEN3 ) { priv->flags &= ~ID_P_NO_RXDMA ; ret =rcar_i2c_do_reset (priv);if (ret)
@@ -948,7 +949,7 @@ static const struct of_device_id rcar_i2c_dt_ids[] = { { .compatible = "renesas,rcar-gen1-i2c", .data = (void *)I2C_RCAR_GEN1 }, { .compatible = "renesas,rcar-gen2-i2c", .data = (void *)I2C_RCAR_GEN2 }, { .compatible = "renesas,rcar-gen3-i2c", .data = (void *)I2C_RCAR_GEN3 }, - { .compatible = "renesas,rcar-gen4-i2c", .data = (void *)I2C_RCAR_GEN3 }, + { .compatible = "renesas,rcar-gen4-i2c", .data = (void *)I2C_RCAR_GEN4 }, {}, };MODULE_DEVICE_TABLE (of, rcar_i2c_dt_ids);
@@ -1026,7 +1027,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)if (of_property_read_bool (dev->of_node,"smbus" )) priv->flags |=ID_P_HOST_NOTIFY ; -if (priv->devtype ==I2C_RCAR_GEN3 ) { +if (priv->devtype >=I2C_RCAR_GEN3 ) { priv->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL );if (IS_ERR (priv->rstc)) goto out_pm_put;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 96/108 ipv6: annotate data-races around cnf.disable_ipv6
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit d289ab65b89c1d4d88417cb6c03e923f21f95fae upstream.
disable_ipv6 is read locklessly, add appropriate READ_ONCE() and WRITE_ONCE() annotations.
v2: do not preload net before rtnl_trylock() in
addrconf_disable_ipv6() (Jiri)
--- net/ipv6/addrconf.c | 9 +++++---- net/ipv6/ip6_input.c | 2 +- net/ipv6/ip6_output.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-)
net/ipv6/addrconf.c +5 -4
@@ -4107,7 +4107,7 @@ static void addrconf_dad_work(struct worif (!ipv6_generate_eui64 (addr.s6_addr +8 , idev->dev) &&ipv6_addr_equal (&ifp->addr, &addr)) {/* DAD failed for link-local based on MAC */ - idev->cnf.disable_ipv6 =1 ; +WRITE_ONCE (idev->cnf.disable_ipv6,1 );pr_info ("%s: IPv6 being disabled!\n" , ifp->idev->dev->name);
@@ -6220,7 +6220,8 @@ static void addrconf_disable_change(stru idev =__in6_dev_get (dev);if (idev) {int changed = (!idev->cnf.disable_ipv6) ^ (!newf); - idev->cnf.disable_ipv6 = newf; + +WRITE_ONCE (idev->cnf.disable_ipv6, newf);if (changed)dev_disable_change (idev); }
@@ -6237,7 +6238,7 @@ static int addrconf_disable_ipv6(struct net = (struct net *)table->extra2; old = *p; - *p = newf; +WRITE_ONCE (*p, newf);if (p == &net->ipv6.devconf_dflt->disable_ipv6) {rtnl_unlock ();
@@ -6245,7 +6246,7 @@ static int addrconf_disable_ipv6(struct }if (p == &net->ipv6.devconf_all->disable_ipv6) { - net->ipv6.devconf_dflt->disable_ipv6 = newf; +WRITE_ONCE (net->ipv6.devconf_dflt->disable_ipv6, newf);addrconf_disable_change (net, newf); }else if ((!newf) ^ (!old))dev_disable_change ((struct inet6_dev *)table->extra1);
net/ipv6/ip6_input.c +1 -1
@@ -165,7 +165,7 @@ static struct sk_buff *ip6_rcv_core(stru__IP6_UPD_PO_STATS (net, idev,IPSTATS_MIB_IN , skb->len);if ((skb =skb_share_check (skb,GFP_ATOMIC )) ==NULL || - !idev ||unlikely (idev->cnf.disable_ipv6)) { + !idev ||unlikely (READ_ONCE (idev->cnf.disable_ipv6))) {__IP6_INC_STATS (net, idev,IPSTATS_MIB_INDISCARDS ); goto drop; }
net/ipv6/ip6_output.c +1 -1
@@ -240,7 +240,7 @@ int ip6_output(struct net *net, struct s skb->protocol =htons (ETH_P_IPV6 ); skb->dev = dev; -if (unlikely (idev->cnf.disable_ipv6)) { +if (unlikely (READ_ONCE (idev->cnf.disable_ipv6))) {IP6_INC_STATS (net, idev,IPSTATS_MIB_OUTDISCARDS );kfree_skb (skb);return 0 ;
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.222 release. There are 108 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 18 Jul 2024 15:27:21 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.222-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.222 release. There are 108 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.222 release. There are 108 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 18 Jul 2024 15:27:21 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.222-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
The 390 builds failed on stable-rc 5.10.222-rc1 review; it has been reported on 6.6, 6.1, 5.15 and now on 5.10.
Started from this round of stable rc on 5.10.222-rc1
Good:6db6c4ec363b ("Linux 5.10.221-rc2")
BAD: 4ec8d630a600 ("Linux 5.10.222-rc1")
* s390, build
- clang-18-allnoconfig
- clang-18-defconfig
- clang-18-tinyconfig
- clang-nightly-allnoconfig
- clang-nightly-defconfig
- clang-nightly-tinyconfig
- gcc-12-allnoconfig
- gcc-12-defconfig
- gcc-12-tinyconfig
- gcc-8-allnoconfig
- gcc-8-defconfig-fe40093d
- gcc-8-tinyconfig
Build log:
-------linux/arch/s390/include/asm/processor.h: In function '__load_psw_mask':arch/s390/include/asm/processor.h:255:19: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__uninitialized'
255 | psw_t psw __uninitialized;
| ^~~~~~~~~~~~~~~arch/s390/include/asm/processor.h:255:19: error: '__uninitialized' undeclared (first use in this function) arch/s390/include/asm/processor.h:255:19: note: each undeclared identifier is reported only once for each function it appears in arch/s390/include/asm/processor.h:256:9: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
256 | unsigned long addr;
| ^~~~~~~~
arch/s390/include/asm/processor.h:258:9: error: 'psw' undeclared
(first use in this function); did you mean 'psw_t'?
258 | psw.mask = mask;
| ^~~
| psw_tmetadata:
---------
config: https://storage.tuxsuite.com/public/linaro/lkft/builds/2jKrKyHqAZ7eSsKwMSVqDueYpKo/config
download_url:
https://storage.tuxsuite.com/public/linaro/lkft/builds/2jKrKyHqAZ7eSsKwMSVqDueYpKo/
git_describe: v5.10.221-109-g4ec8d630a600
git_repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git_sha: 4ec8d630a6005e1aa82671aca9f6716039f5b6e7
git_short_log: 4ec8d630a600 ("Linux 5.10.222-rc1")
arch: s390
toolchain: gcc-12 and clang-18
Steps to reproduce:
----------
# tuxmake --runtime podman --target-arch s390 --toolchain gcc-12 --kconfig tinyconfig
--
Linaro LKFT
https://lkft.linaro.org
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.222 release. There are 108 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Greg Kroah-Hartman wrote on Tue, Jul 16, 2024 at 05:30:15PM +0200:
Quoted 5 lines
This is the start of the stable review cycle for the 5.10.222 release. There are 108 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Thu, 18 Jul 2024 15:27:21 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.222-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.
Tested 4ec8d630a600 ("Linux 5.10.222-rc1") on:
- arm i.MX6ULL (Armadillo 640)
- arm64 i.MX8MP (Armadillo G4)
No obvious regression in dmesg or basic tests:
Signature · 1 line
Dominique Martinet
Greg Kroah-Hartman
maintainerQuoted 60 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.222 release. There are 108 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 18 Jul 2024 15:27:21 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.222-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
The 390 builds failed on stable-rc 5.10.222-rc1 review; it has been reported on 6.6, 6.1, 5.15 and now on 5.10.
Started from this round of stable rc on 5.10.222-rc1
Good:6db6c4ec363b ("Linux 5.10.221-rc2")
BAD:4ec8d630a600("Linux 5.10.222-rc1")* s390, build
- clang-18-allnoconfig
- clang-18-defconfig
- clang-18-tinyconfig
- clang-nightly-allnoconfig
- clang-nightly-defconfig
- clang-nightly-tinyconfig
- gcc-12-allnoconfig
- gcc-12-defconfig
- gcc-12-tinyconfig
- gcc-8-allnoconfig
- gcc-8-defconfig-fe40093d
- gcc-8-tinyconfigBuild log:
-------linux/arch/s390/include/asm/processor.h: In function '__load_psw_mask':arch/s390/include/asm/processor.h:255:19: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__uninitialized'255 | psw_t psw __uninitialized; | ^~~~~~~~~~~~~~~
arch/s390/include/asm/processor.h:255:19: error: '__uninitialized' undeclared (first use in this function)arch/s390/include/asm/processor.h:255:19: note: each undeclared identifier is reported only once for each function it appears inarch/s390/include/asm/processor.h:256:9: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
Quoted 7 lines
256 | unsigned long addr;
| ^~~~~~~~
arch/s390/include/asm/processor.h:258:9: error: 'psw' undeclared
(first use in this function); did you mean 'psw_t'?
258 | psw.mask = mask;
| ^~~
| psw_tShould now be fixed, will push out -rc2 releases later today with the attempted resolution.
greg k-h