4.19.198-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 171/421 iio: accel: kxcjk-1013: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 3ab3aa2e7bd57497f9a7c6275c00dce237d2c9ba ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of this function.
--- drivers/iio/accel/kxcjk-1013.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/iio/accel/kxcjk-1013.c +14 -10
@@ -140,12 +140,23 @@ enum kx_acpi_type { ACPI_KIOX010A, }; +enum kxcjk1013_axis { +AXIS_X , +AXIS_Y , +AXIS_Z , +AXIS_MAX +}; +struct kxcjk1013_data {struct i2c_client *client;struct iio_trigger *dready_trig;struct iio_trigger *motion_trig;struct mutex mutex; -s16 buffer[8 ]; +/* Ensure timestamp naturally aligned */ +struct { +s16 chans[AXIS_MAX ]; +s64 timestamp__aligned(8) ; + } scan;u8 odr_bits;u8 range;int wake_thres;
@@ -159,13 +170,6 @@ struct kxcjk1013_data {enum kx_acpi_type acpi_type; }; -enum kxcjk1013_axis { -AXIS_X , -AXIS_Y , -AXIS_Z , -AXIS_MAX , -}; -enum kxcjk1013_mode {STANDBY ,OPERATION ,
@@ -1086,12 +1090,12 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) ret =i2c_smbus_read_i2c_block_data_or_emulated (data->client,KXCJK1013_REG_XOUT_L ,AXIS_MAX *2 , - (u8 *)data->buffer); + (u8 *)data->scan.chans);mutex_unlock (&data->mutex);if (ret <0 ) goto err; -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan, data->timestamp); err:iio_trigger_notify_done (indio_dev->trig);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 172/421 iio: accel: stk8312: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit f40a71ffec808e7e51848f63f0c0d3c32d65081b ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of this function.
--- drivers/iio/accel/stk8312.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/iio/accel/stk8312.c +8 -4
@@ -106,7 +106,11 @@ struct stk8312_data {u8 mode;struct iio_trigger *dready_trig;bool dready_trigger_on; -s8 buffer[16 ];/* 3x8-bit channels + 5x8 padding + 64-bit timestamp */ +/* Ensure timestamp is naturally aligned */ +struct { +s8 chans[3 ]; +s64 timestamp__aligned(8) ; + } scan; }; static IIO_CONST_ATTR(in_accel_scale_available, STK8312_SCALE_AVAIL);
@@ -441,7 +445,7 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) ret =i2c_smbus_read_i2c_block_data (data->client,STK8312_REG_XOUT ,STK8312_ALL_CHANNEL_SIZE , - data->buffer); + data->scan.chans);if (ret <STK8312_ALL_CHANNEL_SIZE ) {dev_err (&data->client->dev,"register read failed\n" );mutex_unlock (&data->lock);
@@ -455,12 +459,12 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p)mutex_unlock (&data->lock); goto err; } - data->buffer[i++] = ret; + data->scan.chans[i++] = ret; } }mutex_unlock (&data->lock); -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan, pf->timestamp); err:iio_trigger_notify_done (indio_dev->trig);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 173/421 iio: accel: stk8ba50: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 334883894bc1e145a1e0f5de1b0d1b6a1133f0e6 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of this function.
--- drivers/iio/accel/stk8ba50.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/iio/accel/stk8ba50.c +8 -9
@@ -94,12 +94,11 @@ struct stk8ba50_data {u8 sample_rate_idx;struct iio_trigger *dready_trig;bool dready_trigger_on; -/* -* 3 x 16-bit channels (10-bit data, 6-bit padding) + -* 1 x 16 padding + -* 4 x 16 64-bit timestamp -*/ -s16 buffer[8 ]; +/* Ensure timestamp is naturally aligned */ +struct { +s16 chans[3 ]; +s64 timetamp__aligned(8) ; + } scan; };#define STK8BA50_ACCEL_CHANNEL (index, reg, axis) { \
@@ -327,7 +326,7 @@ static irqreturn_t stk8ba50_trigger_handler(int irq, void *p) ret =i2c_smbus_read_i2c_block_data (data->client,STK8BA50_REG_XOUT ,STK8BA50_ALL_CHANNEL_SIZE , - (u8 *)data->buffer); + (u8 *)data->scan.chans);if (ret <STK8BA50_ALL_CHANNEL_SIZE ) {dev_err (&data->client->dev,"register read failed\n" ); goto err;
@@ -340,10 +339,10 @@ static irqreturn_t stk8ba50_trigger_handler(int irq, void *p)if (ret <0 ) goto err; - data->buffer[i++] = ret; + data->scan.chans[i++] = ret; } } -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan, pf->timestamp); err:mutex_unlock (&data->lock);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 174/421 iio: adc: ti-ads1015: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit d85d71dd1ab67eaa7351f69fec512d8f09d164e1 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of this function.
--- drivers/iio/adc/ti-ads1015.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/iio/adc/ti-ads1015.c +8 -4
@@ -391,10 +391,14 @@ static irqreturn_t ads1015_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct ads1015_data *data =iio_priv (indio_dev); -s16 buf[8 ];/* 1x s16 ADC val + 3x s16 padding + 4x s16 timestamp */ +/* Ensure natural alignment of timestamp */ +struct { +s16 chan; +s64 timestamp__aligned(8) ; + } scan;int chan, ret, res; -memset (buf,0 ,sizeof (buf)); +memset (&scan,0 ,sizeof (scan));mutex_lock (&data->lock); chan = find_first_bit(indio_dev->active_scan_mask,
@@ -405,10 +409,10 @@ static irqreturn_t ads1015_trigger_handler(int irq, void *p) goto err; } - buf[0 ] = res; + scan.chan = res;mutex_unlock (&data->lock); -iio_push_to_buffers_with_timestamp (indio_dev, buf, +iio_push_to_buffers_with_timestamp (indio_dev, &scan,iio_get_time_ns (indio_dev)); err:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 175/421 iio: adc: vf610: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 7765dfaa22ea08abf0c175e7553826ba2a939632 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp()
--- drivers/iio/adc/vf610_adc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/adc/vf610_adc.c +7 -3
@@ -180,7 +180,11 @@ struct vf610_adc {u32 sample_freq_avail[5 ];struct completion completion; -u16 buffer[8 ]; +/* Ensure the timestamp is naturally aligned */ +struct { +u16 chan; +s64 timestamp__aligned(8) ; + } scan; };static const u32 vf610_hw_avgs[] = {1 ,4 ,8 ,16 ,32 };
@@ -592,9 +596,9 @@ static irqreturn_t vf610_adc_isr(int irq, void *dev_id)if (coco &VF610_ADC_HS_COCO0 ) { info->value =vf610_adc_read_data (info);if (iio_buffer_enabled (indio_dev)) { - info->buffer[0 ] = info->value; + info->scan.chan = info->value;iio_push_to_buffers_with_timestamp (indio_dev, - info->buffer, + &info->scan,iio_get_time_ns (indio_dev));iio_trigger_notify_done (indio_dev->trig); }else
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 176/421 iio: gyro: bmg160: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 06778d881f3798ce93ffbbbf801234292250b598 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp()
--- drivers/iio/gyro/bmg160_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/gyro/bmg160_core.c +7 -3
@@ -103,7 +103,11 @@ struct bmg160_data {struct iio_trigger *dready_trig;struct iio_trigger *motion_trig;struct mutex mutex; -s16 buffer[8 ]; +/* Ensure naturally aligned timestamp */ +struct { +s16 chans[3 ]; +s64 timestamp__aligned(8) ; + } scan;u32 dps_range;int ev_enable_state;int slope_thres;
@@ -872,12 +876,12 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)mutex_lock (&data->mutex); ret =regmap_bulk_read (data->regmap,BMG160_REG_XOUT_L , - data->buffer,AXIS_MAX *2 ); + data->scan.chans,AXIS_MAX *2 );mutex_unlock (&data->mutex);if (ret <0 ) goto err; -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan, pf->timestamp); err:iio_trigger_notify_done (indio_dev->trig);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 177/421 iio: humidity: am2315: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit f4ca2e2595d9fee65d5ce0d218b22ce00e5b2915 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp()
--- drivers/iio/humidity/am2315.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/iio/humidity/am2315.c +10 -6
@@ -36,7 +36,11 @@struct am2315_data {struct i2c_client *client;struct mutex lock; -s16 buffer[8 ];/* 2x16-bit channels + 2x16 padding + 4x16 timestamp */ +/* Ensure timestamp is naturally aligned */ +struct { +s16 chans[2 ]; +s64 timestamp__aligned(8) ; + } scan; };struct am2315_sensor_data {
@@ -170,20 +174,20 @@ static irqreturn_t am2315_trigger_handler(int irq, void *p)mutex_lock (&data->lock);if (*(indio_dev->active_scan_mask) ==AM2315_ALL_CHANNEL_MASK ) { - data->buffer[0 ] = sensor_data.hum_data; - data->buffer[1 ] = sensor_data.temp_data; + data->scan.chans[0 ] = sensor_data.hum_data; + data->scan.chans[1 ] = sensor_data.temp_data; }else { i =0 ;for_each_set_bit (bit, indio_dev->active_scan_mask, indio_dev->masklength) { - data->buffer[i] = (bit ? sensor_data.temp_data : - sensor_data.hum_data); + data->scan.chans[i] = (bit ? sensor_data.temp_data : + sensor_data.hum_data); i++; } }mutex_unlock (&data->lock); -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan, pf->timestamp); err:iio_trigger_notify_done (indio_dev->trig);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 178/421 iio: prox: srf08: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 19f1a254fe4949fff1e67db386409f48cf438bd7 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp()
--- drivers/iio/proximity/srf08.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/iio/proximity/srf08.c +7 -7
@@ -66,11 +66,11 @@ struct srf08_data {int range_mm;struct mutex lock; -/* -* triggered buffer -* 1x16-bit channel + 3x16 padding + 4x16 timestamp -*/ -s16 buffer[8 ]; +/* Ensure timestamp is naturally aligned */ +struct { +s16 chan; +s64 timestamp__aligned(8) ; + } scan;/* Sensor-Type */ enum srf08_sensor_type sensor_type;
@@ -193,9 +193,9 @@ static irqreturn_t srf08_trigger_handler(int irq, void *p)mutex_lock (&data->lock); - data->buffer[0 ] = sensor_data; + data->scan.chan = sensor_data;iio_push_to_buffers_with_timestamp (indio_dev, - data->buffer, pf->timestamp); + &data->scan, pf->timestamp);mutex_unlock (&data->lock); err:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 179/421 iio: prox: pulsed-light: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 679cc377a03ff1944491eafc7355c1eb1fad4109 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp()
--- drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +7 -3
@@ -43,7 +43,11 @@ struct lidar_data {int (*xfer)(struct lidar_data *data,u8 reg,u8 *val,int len);int i2c_enabled; -u16 buffer[8 ];/* 2 byte distance + 8 byte timestamp */ +/* Ensure timestamp is naturally aligned */ +struct { +u16 chan; +s64 timestamp__aligned(8) ; + } scan; };static const struct iio_chan_spec lidar_channels[] = {
@@ -228,9 +232,9 @@ static irqreturn_t lidar_trigger_handler(int irq, void *private)struct lidar_data *data =iio_priv (indio_dev);int ret; - ret =lidar_get_measurement (data, data->buffer); + ret =lidar_get_measurement (data, &data->scan.chan);if (!ret) { -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan,iio_get_time_ns (indio_dev)); }else if (ret != -EINVAL ) {dev_err (&data->client->dev,"cannot read LIDAR measurement" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 180/421 iio: prox: as3935: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 37eb8d8c64f2ecb3a5521ba1cc1fad973adfae41 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp()
--- drivers/iio/proximity/as3935.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/proximity/as3935.c +7 -3
@@ -61,7 +61,11 @@ struct as3935_state {unsigned long noise_tripped;u32 tune_cap;u32 nflwdth_reg; -u8 buffer[16 ];/* 8-bit data + 56-bit padding + 64-bit timestamp */ +/* Ensure timestamp is naturally aligned */ +struct { +u8 chan; +s64 timestamp__aligned(8) ; + } scan;u8 buf[2 ]____cacheline_aligned ; };
@@ -227,8 +231,8 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private)if (ret) goto err_read; - st->buffer[0 ] = val &AS3935_DATA_MASK ; -iio_push_to_buffers_with_timestamp (indio_dev, &st->buffer, + st->scan.chan = val &AS3935_DATA_MASK ; +iio_push_to_buffers_with_timestamp (indio_dev, &st->scan,iio_get_time_ns (indio_dev)); err_read:iio_trigger_notify_done (indio_dev->trig);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 181/421 iio: light: isl29125: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 3d4725194de6935dba2ad7c9cc075c885008f747 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp()
--- drivers/iio/light/isl29125.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/light/isl29125.c +7 -3
@@ -54,7 +54,11 @@struct isl29125_data {struct i2c_client *client;u8 conf1; -u16 buffer[8 ];/* 3x 16-bit, padding, 8 bytes timestamp */ +/* Ensure timestamp is naturally aligned */ +struct { +u16 chans[3 ]; +s64 timestamp__aligned(8) ; + } scan; };#define ISL29125_CHANNEL (_color, _si) { \
@@ -187,10 +191,10 @@ static irqreturn_t isl29125_trigger_handler(int irq, void *p)if (ret <0 ) goto done; - data->buffer[j++] = ret; + data->scan.chans[j++] = ret; } -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan,iio_get_time_ns (indio_dev)); done:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 182/421 iio: light: tcs3414: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit ff08fbc22ab32ccc6690c21b0e5e1d402dcc076f ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp()
--- drivers/iio/light/tcs3414.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/light/tcs3414.c +7 -3
@@ -56,7 +56,11 @@ struct tcs3414_data {u8 control;u8 gain;u8 timing; -u16 buffer[8 ];/* 4x 16-bit + 8 bytes timestamp */ +/* Ensure timestamp is naturally aligned */ +struct { +u16 chans[4 ]; +s64 timestamp__aligned(8) ; + } scan; };#define TCS3414_CHANNEL (_color, _si, _addr) { \
@@ -212,10 +216,10 @@ static irqreturn_t tcs3414_trigger_handler(int irq, void *p)if (ret <0 ) goto done; - data->buffer[j++] = ret; + data->scan.chans[j++] = ret; } -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan,iio_get_time_ns (indio_dev)); done:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 183/421 iio: light: tcs3472: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit df2f37cffd6ed486d613e7ee22aadc8e49ae2dd3 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of uses ofiio_push_to_buffers_with_timestamp().
Fixes tag is not strictly accurate as prior to that patch there was potentially an unaligned write. However, any backport past there will need to be done manually.
--- drivers/iio/light/tcs3472.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/light/tcs3472.c +7 -3
@@ -67,7 +67,11 @@ struct tcs3472_data {u8 control;u8 atime;u8 apers; -u16 buffer[8 ];/* 4 16-bit channels + 64-bit timestamp */ +/* Ensure timestamp is naturally aligned */ +struct { +u16 chans[4 ]; +s64 timestamp__aligned(8) ; + } scan; };static const struct iio_event_spec tcs3472_events[] = {
@@ -389,10 +393,10 @@ static irqreturn_t tcs3472_trigger_handler(int irq, void *p)if (ret <0 ) goto done; - data->buffer[j++] = ret; + data->scan.chans[j++] = ret; } -iio_push_to_buffers_with_timestamp (indio_dev, data->buffer, +iio_push_to_buffers_with_timestamp (indio_dev, &data->scan,iio_get_time_ns (indio_dev)); done:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 184/421 iio: potentiostat: lmp91000: Fix alignment of buffer in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 8979b67ec61abc232636400ee8c758a16a73c95f ]
Add __aligned(8) to ensure the buffer passed to iio_push_to_buffers_with_timestamp() is suitable for the naturally aligned timestamp that will be inserted.
Here structure is not used, because this buffer is also used elsewhere in the driver.
--- drivers/iio/potentiostat/lmp91000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/potentiostat/lmp91000.c +2 -2
@@ -71,8 +71,8 @@ struct lmp91000_data {struct completion completion;u8 chan_select; - -u32 buffer[4 ];/* 64-bit data + 64-bit timestamp */ +/* 64-bit data + 64-bit naturally aligned timestamp */ +u32 buffer[4 ]__aligned(8) ; };static const struct iio_chan_spec lmp91000_channels[] = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 185/421 ASoC: hisilicon: fix missing clk_disable_unprepare() on error in hi6210_i2s_startup()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 375904e3931955fcf0a847f029b2492a117efc43 ]
After calling clk_prepare_enable(), clk_disable_unprepare() need be called when calling clk_set_rate() failed.
--- sound/soc/hisilicon/hi6210-i2s.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/soc/hisilicon/hi6210-i2s.c +8 -6
@@ -110,18 +110,15 @@ static int hi6210_i2s_startup(struct snd_pcm_substream *substream,for (n =0 ; n < i2s->clocks; n++) { ret =clk_prepare_enable (i2s->clk[n]); -if (ret) { -while (n--) -clk_disable_unprepare (i2s->clk[n]); -return ret; - } +if (ret) + goto err_unprepare_clk; } ret =clk_set_rate (i2s->clk[CLK_I2S_BASE ],49152000 );if (ret) {dev_err (i2s->dev,"%s: setting 49.152MHz base rate failed %d\n" , __func__, ret); -return ret; + goto err_unprepare_clk; }/* enable clock before frequency division */
@@ -173,6 +170,11 @@ static int hi6210_i2s_startup(struct snd_pcm_substream *substream,hi6210_write_reg (i2s,HII2S_SW_RST_N , val);return 0 ; + +err_unprepare_clk: +while (n--) +clk_disable_unprepare (i2s->clk[n]); +return ret; } static void hi6210_i2s_shutdown(struct snd_pcm_substream *substream,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 186/421 ASoC: rsnd: tidyup loop on rsnd_adg_clk_query()
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit cf9d5c6619fadfc41cf8f5154cb990cc38e3da85 ]
commit 06e8f5c842f2d ("ASoC: rsnd: don't call clk_get_rate() under atomic context") used saved clk_rate, thus for_each_rsnd_clk() is no longer needed. This patch fixes it.
--- sound/soc/sh/rcar/adg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/sh/rcar/adg.c +1 -3
@@ -318,7 +318,6 @@ static void rsnd_adg_set_ssi_clk(struct rsnd_mod *ssi_mod, u32 val)int rsnd_adg_clk_query (struct rsnd_priv *priv,unsigned int rate) {struct rsnd_adg *adg =rsnd_priv_to_adg (priv); -struct clk *clk;int i;int sel_table[] = { [CLKA ] =0x1 ,
@@ -331,10 +330,9 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate)* find suitable clock from * AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC/AUDIO_CLKI. */ -for_each_rsnd_clk (clk, adg, i) { +for (i =0 ; i <CLKMAX ; i++)if (rate == adg->clk_rate[i])return sel_table[i]; - }/* * find divided clock from BRGA/BRGB
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 187/421 Input: hil_kbd - fix error return code in hil_dev_connect()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit d9b576917a1d0efa293801a264150a1b37691617 ]
Return error code -EINVAL rather than '0' when the combo devices are not supported.
--- drivers/input/keyboard/hil_kbd.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/keyboard/hil_kbd.c +1 -0
@@ -512,6 +512,7 @@ static int hil_dev_connect(struct serio *serio, struct serio_driver *drv) HIL_IDD_NUM_AXES_PER_SET(*idd)) { printk(KERN_INFO PREFIX "combo devices are not supported.\n"); + error = -EINVAL ; goto bail1; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 188/421 char: pcmcia: error out if num_bytes_read is greater than 4 in set_protocol()
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 37188559c610f1b7eec83c8e448936c361c578de ]
Theoretically, it will cause index out of bounds error if 'num_bytes_read' is greater than 4. As we expect it(and was tested) never to be greater than 4, error out if it happens.
--- drivers/char/pcmcia/cm4000_cs.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/char/pcmcia/cm4000_cs.c +4 -0
@@ -544,6 +544,10 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq)io_read_num_rec_bytes (iobase, &num_bytes_read);if (num_bytes_read >=4 ) {DEBUGP (2 , dev,"NumRecBytes = %i\n" , num_bytes_read); +if (num_bytes_read >4 ) { + rc = -EIO ; + goto exit_setprotocol; + }break ; }mdelay (10 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 189/421 tty: nozomi: Fix the error handling path of nozomi_card_init()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 6ae7d0f5a92b9619f6e3c307ce56b2cefff3f0e9 ]
The error handling path is broken and we may un-register things that have never been registered.
Update the loops index accordingly.
--- drivers/tty/nozomi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/tty/nozomi.c +5 -3
@@ -1403,7 +1403,7 @@ static int nozomi_card_init(struct pci_dev *pdev, NOZOMI_NAME, dc);if (unlikely (ret)) {dev_err (&pdev->dev,"can't request irq %d\n" , pdev->irq); - goto err_free_kfifo; + goto err_free_all_kfifo; }DBG1 ("base_addr: %p" , dc->base_addr);
@@ -1441,13 +1441,15 @@ static int nozomi_card_init(struct pci_dev *pdev,return 0 ; err_free_tty: -for (i =0 ; i <MAX_PORT ; ++i) { +for (i--; i >=0 ; i--) {tty_unregister_device (ntty_driver, dc->index_start + i);tty_port_destroy (&dc->port[i].port); }free_irq (pdev->irq, dc); +err_free_all_kfifo: + i =MAX_PORT ; err_free_kfifo: -for (i =0 ; i <MAX_PORT ; i++) +for (i--; i >=PORT_MDM ; i--)kfifo_free (&dc->port[i].fifo_ul); err_free_sbuf:kfree (dc->send_buf);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 190/421 scsi: FlashPoint: Rename si_flags field
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 4d431153e751caa93f3b7e6f6313446974e92253 ]
The BusLogic driver has build errors on ia64 due to a name collision (in the #included FlashPoint.c file). Rename the struct field in struct sccb_mgr_info from si_flags to si_mflags (manager flags) to mend the build.
This is the first problem. There are 50+ others after this one:
In file included from ../include/uapi/linux/signal.h:6,
from ../include/linux/signal_types.h:10,
from ../include/linux/sched.h:29,
from ../include/linux/hardirq.h:9,
from ../include/linux/interrupt.h:11,
from ../drivers/scsi/BusLogic.c:27:../arch/ia64/include/uapi/asm/siginfo.h:15:27: error: expected ':', ',', ';', '}' or '__attribute__' before '.' token
15 | #define si_flags _sifields._sigfault._flags
| ^../drivers/scsi/FlashPoint.c:43:6: note: in expansion of macro 'si_flags'
43 | u16 si_flags;
| ^~~~~~~~In file included from ../drivers/scsi/BusLogic.c:51:../drivers/scsi/FlashPoint.c: In function 'FlashPoint_ProbeHostAdapter':../drivers/scsi/FlashPoint.c:1076:11: error: 'struct sccb_mgr_info' has no member named '_sifields'
1076 | pCardInfo->si_flags = 0x0000;
| ^~../drivers/scsi/FlashPoint.c:1079:12: error: 'struct sccb_mgr_info' has no member named '_sifields'
--- drivers/scsi/FlashPoint.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/scsi/FlashPoint.c +16 -16
@@ -40,7 +40,7 @@ struct sccb_mgr_info {u16 si_per_targ_ultra_nego;u16 si_per_targ_no_disc;u16 si_per_targ_wide_nego; -u16 si_flags; +u16 si_mflags;unsigned char si_card_family;unsigned char si_bustype;unsigned char si_card_model[3 ];
@@ -1070,22 +1070,22 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo) ScamFlg = (unsigned char )FPT_utilEERead (ioport,SCAM_CONFIG /2 ); - pCardInfo->si_flags =0x0000 ; + pCardInfo->si_mflags =0x0000 ;if (i &0x01 ) - pCardInfo->si_flags |=SCSI_PARITY_ENA ; + pCardInfo->si_mflags |=SCSI_PARITY_ENA ;if (!(i &0x02 )) - pCardInfo->si_flags |=SOFT_RESET ; + pCardInfo->si_mflags |=SOFT_RESET ;if (i &0x10 ) - pCardInfo->si_flags |=EXTENDED_TRANSLATION ; + pCardInfo->si_mflags |=EXTENDED_TRANSLATION ;if (ScamFlg &SCAM_ENABLED ) - pCardInfo->si_flags |=FLAG_SCAM_ENABLED ; + pCardInfo->si_mflags |=FLAG_SCAM_ENABLED ;if (ScamFlg &SCAM_LEVEL2 ) - pCardInfo->si_flags |=FLAG_SCAM_LEVEL2 ; + pCardInfo->si_mflags |=FLAG_SCAM_LEVEL2 ; j = (RD_HARPOON (ioport + hp_bm_ctrl) & ~SCSI_TERM_ENA_L );if (i &0x04 ) {
@@ -1101,7 +1101,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo)if (!(RD_HARPOON (ioport + hp_page_ctrl) &NARROW_SCSI_CARD )) - pCardInfo->si_flags |=SUPPORT_16TAR_32LUN ; + pCardInfo->si_mflags |=SUPPORT_16TAR_32LUN ; pCardInfo->si_card_family =HARPOON_FAMILY ; pCardInfo->si_bustype =BUSTYPE_PCI ;
@@ -1137,15 +1137,15 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo)if (pCardInfo->si_card_model[1 ] =='3' ) {if (RD_HARPOON (ioport + hp_ee_ctrl) &BIT (7 )) - pCardInfo->si_flags |=LOW_BYTE_TERM ; + pCardInfo->si_mflags |=LOW_BYTE_TERM ; }else if (pCardInfo->si_card_model[2 ] =='0' ) { temp =RD_HARPOON (ioport + hp_xfer_pad);WR_HARPOON (ioport + hp_xfer_pad, (temp & ~BIT (4 )));if (RD_HARPOON (ioport + hp_ee_ctrl) &BIT (7 )) - pCardInfo->si_flags |=LOW_BYTE_TERM ; + pCardInfo->si_mflags |=LOW_BYTE_TERM ;WR_HARPOON (ioport + hp_xfer_pad, (temp |BIT (4 )));if (RD_HARPOON (ioport + hp_ee_ctrl) &BIT (7 )) - pCardInfo->si_flags |=HIGH_BYTE_TERM ; + pCardInfo->si_mflags |=HIGH_BYTE_TERM ;WR_HARPOON (ioport + hp_xfer_pad, temp); }else { temp =RD_HARPOON (ioport + hp_ee_ctrl);
@@ -1163,9 +1163,9 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info *pCardInfo)WR_HARPOON (ioport + hp_ee_ctrl, temp);WR_HARPOON (ioport + hp_xfer_pad, temp2);if (!(temp3 &BIT (7 ))) - pCardInfo->si_flags |=LOW_BYTE_TERM ; + pCardInfo->si_mflags |=LOW_BYTE_TERM ;if (!(temp3 &BIT (6 ))) - pCardInfo->si_flags |=HIGH_BYTE_TERM ; + pCardInfo->si_mflags |=HIGH_BYTE_TERM ; }ARAM_ACCESS (ioport);
@@ -1272,7 +1272,7 @@ static void *FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_infoWR_HARPOON (ioport + hp_arb_id, pCardInfo->si_id); CurrCard->ourId = pCardInfo->si_id; - i = (unsigned char )pCardInfo->si_flags; + i = (unsigned char )pCardInfo->si_mflags;if (i &SCSI_PARITY_ENA )WR_HARPOON (ioport + hp_portctrl_1, (HOST_MODE8 |CHK_SCSI_P ));
@@ -1286,14 +1286,14 @@ static void *FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info j |=SCSI_TERM_ENA_H ;WR_HARPOON (ioport + hp_ee_ctrl, j); -if (!(pCardInfo->si_flags &SOFT_RESET )) { +if (!(pCardInfo->si_mflags &SOFT_RESET )) {FPT_sresb (ioport, thisCard);FPT_scini (thisCard, pCardInfo->si_id,0 ); } -if (pCardInfo->si_flags &POST_ALL_UNDERRRUNS ) +if (pCardInfo->si_mflags &POST_ALL_UNDERRRUNS ) CurrCard->globalFlags |=F_NO_FILTER ;if (pCurrNvRam) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 191/421 fsi: core: Fix return of error values on failures
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 910810945707fe9877ca86a0dca4e585fd05e37b ]
Currently the cfam_read and cfam_write functions return the provided number of bytes given in the count parameter and not the error return code in variable rc, hence all failures of read/writes are being silently ignored. Fix this by returning the error code in rc.
Addresses-Coverity: ("Unused value")
--- drivers/fsi/fsi-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/fsi/fsi-core.c +2 -2
@@ -726,7 +726,7 @@ static ssize_t cfam_read(struct file *filep, char __user *buf, size_t count, rc = count; fail: *offset = off; -return count; +return rc; } static ssize_t cfam_write(struct file *filep, const char __user *buf,
@@ -763,7 +763,7 @@ static ssize_t cfam_write(struct file *filep, const char __user *buf, rc = count; fail: *offset = off; -return count; +return rc; }static loff_t cfam_llseek (struct file *file,loff_t offset,int whence)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 192/421 fsi: scom: Reset the FSI2PIB engine for any error
In reply to Greg Kroah-HartmanFrom: Eddie James <[email protected]>
[ Upstream commit a5c317dac5567206ca7b6bc9d008dd6890c8bced ]
The error bits in the FSI2PIB status are only cleared by a reset. So the driver needs to perform a reset after seeing any of the FSI2PIB errors, otherwise subsequent operations will also look like failures.
--- drivers/fsi/fsi-scom.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/fsi/fsi-scom.c +9 -7
@@ -47,9 +47,10 @@#define SCOM_STATUS_PIB_RESP_MASK 0x00007000#define SCOM_STATUS_PIB_RESP_SHIFT 12 -#define SCOM_STATUS_ANY_ERR (SCOM_STATUS_PROTECTION | \ - SCOM_STATUS_PARITY | \ - SCOM_STATUS_PIB_ABORT | \ +#define SCOM_STATUS_FSI2PIB_ERROR (SCOM_STATUS_PROTECTION | \ + SCOM_STATUS_PARITY | \ + SCOM_STATUS_PIB_ABORT) +#define SCOM_STATUS_ANY_ERR (SCOM_STATUS_FSI2PIB_ERROR | \ SCOM_STATUS_PIB_RESP_MASK)/* SCOM address encodings */ #define XSCOM_ADDR_IND_FLAG BIT_ULL(63)
@@ -249,13 +250,14 @@ static int handle_fsi2pib_status(struct scom_device *scom, uint32_t status) {uint32_t dummy =-1 ; -if (status &SCOM_STATUS_PROTECTION ) -return -EPERM ; -if (status &SCOM_STATUS_PARITY ) { +if (status &SCOM_STATUS_FSI2PIB_ERROR )fsi_device_write (scom->fsi_dev,SCOM_FSI2PIB_RESET_REG , &dummy,sizeof (uint32_t )); + +if (status &SCOM_STATUS_PROTECTION ) +return -EPERM ; +if (status &SCOM_STATUS_PARITY )return -EIO ; - }/* Return -EBUSY on PIB abort to force a retry */ if (status &SCOM_STATUS_PIB_ABORT )return -EBUSY ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 193/421 fsi/sbefifo: Clean up correct FIFO when receiving reset request from SBE
In reply to Greg Kroah-HartmanFrom: Joachim Fenkes <[email protected]>
[ Upstream commit 95152433e46fdb36652ebdbea442356a16ae1fa6 ]
When the SBE requests a reset via the down FIFO, that is also the FIFO we should go and reset ;)
--- drivers/fsi/fsi-sbefifo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fsi/fsi-sbefifo.c +1 -1
@@ -400,7 +400,7 @@ static int sbefifo_cleanup_hw(struct sbefifo *sbefifo)/* The FIFO already contains a reset request from the SBE ? */ if (down_status &SBEFIFO_STS_RESET_REQ ) {dev_info (dev,"Cleanup: FIFO reset request set, resetting\n" ); - rc =sbefifo_regw (sbefifo,SBEFIFO_UP ,SBEFIFO_PERFORM_RESET ); + rc =sbefifo_regw (sbefifo,SBEFIFO_DOWN ,SBEFIFO_PERFORM_RESET );if (rc) { sbefifo->broken = true;dev_err (dev,"Cleanup: Reset reg write failed, rc=%d\n" , rc);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 194/421 fsi/sbefifo: Fix reset timeout
In reply to Greg Kroah-HartmanFrom: Joachim Fenkes <[email protected]>
[ Upstream commit 9ab1428dfe2c66b51e0b41337cd0164da0ab6080 ]
On BMCs with lower timer resolution than 1ms, msleep(1) will take way longer than 1ms, so looping 10k times won't wait for 10s but significantly longer.
Fix this by using jiffies like the rest of the code.
--- drivers/fsi/fsi-sbefifo.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/fsi/fsi-sbefifo.c +5 -3
@@ -325,7 +325,8 @@ static int sbefifo_up_write(struct sbefifo *sbefifo, __be32 word)static int sbefifo_request_reset (struct sbefifo *sbefifo) {struct device *dev = &sbefifo->fsi_dev->dev; -u32 status, timeout; +unsigned long end_time; +u32 status;int rc;dev_dbg (dev,"Requesting FIFO reset\n" );
@@ -341,7 +342,8 @@ static int sbefifo_request_reset(struct sbefifo *sbefifo) }/* Wait for it to complete */ -for (timeout =0 ; timeout <SBEFIFO_RESET_TIMEOUT ; timeout++) { + end_time = jiffies +msecs_to_jiffies (SBEFIFO_RESET_TIMEOUT ); +while (!time_after (jiffies, end_time)) { rc =sbefifo_regr (sbefifo,SBEFIFO_UP |SBEFIFO_STS , &status);if (rc) { dev_err(dev, "Failed to read UP fifo status during reset"
@@ -355,7 +357,7 @@ static int sbefifo_request_reset(struct sbefifo *sbefifo)return 0 ; } -msleep (1 ); +cond_resched (); }dev_err (dev,"FIFO reset timed out\n" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 195/421 visorbus: fix error return code in visorchipset_init()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit ce52ec5beecc1079c251f60e3973b3758f60eb59 ]
Commit 1366a3db3dcf ("staging: unisys: visorbus: visorchipset_init clean up gotos") assigns the initial value -ENODEV to the local variable 'err', and the first several error branches will return this value after "goto error". But commit f1f537c2e7f5 ("staging: unisys: visorbus: Consolidate controlvm channel creation.") overwrites 'err' in the middle of the way. As a result, some error branches do not successfully return the initial value -ENODEV of 'err', but return 0.
In addition, when kzalloc() fails, -ENOMEM should be returned instead of -ENODEV.
--- drivers/visorbus/visorchipset.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/visorbus/visorchipset.c +4 -2
@@ -1561,7 +1561,7 @@ schedule_out:static int visorchipset_init (struct acpi_device *acpi_device) { -int err = -ENODEV ; +int err = -ENOMEM ;struct visorchannel *controlvm_channel; chipset_dev =kzalloc (sizeof (*chipset_dev),GFP_KERNEL );
@@ -1584,8 +1584,10 @@ static int visorchipset_init(struct acpi_device *acpi_device) "controlvm", sizeof(struct visor_controlvm_channel), VISOR_CONTROLVM_CHANNEL_VERSIONID, - VISOR_CHANNEL_SIGNATURE)) + VISOR_CHANNEL_SIGNATURE)) { + err = -ENODEV ; goto error_delete_groups; + }/* if booting in a crash kernel */ if (is_kdump_kernel ()) INIT_DELAYED_WORK(&chipset_dev->periodic_controlvm_work,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 196/421 s390: appldata depends on PROC_SYSCTL
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 5d3516b3647621d5a1180672ea9e0817fb718ada ]
APPLDATA_BASE should depend on PROC_SYSCTL instead of PROC_FS. Building with PROC_FS but not PROC_SYSCTL causes a build error, since appldata_base.c uses data and APIs from fs/proc/proc_sysctl.c.
arch/s390/appldata/appldata_base.o: in function `appldata_generic_handler':
appldata_base.c:(.text+0x192): undefined reference to `sysctl_vals'
--- arch/s390/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/Kconfig +1 -1
@@ -867,7 +867,7 @@ config CMM_IUCV config APPLDATA_BASE def_bool n prompt "Linux - VM Monitor Stream, base infrastructure" - depends on PROC_FS + depends on PROC_SYSCTL help This provides a kernel interface for creating and updating z/VM APPLDATA monitor records. The monitor records are updated at certain time
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 197/421 eeprom: idt_89hpesx: Put fwnode in matching case during ->probe()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 3f6ee1c095156a74ab2df605af13020f1ce3e600 ]
device_get_next_child_node() bumps a reference counting of a returned variable. We have to balance it whenever we return to the caller.
--- drivers/misc/eeprom/idt_89hpesx.c | 1 + 1 file changed, 1 insertion(+)
drivers/misc/eeprom/idt_89hpesx.c +1 -0
@@ -1163,6 +1163,7 @@ static void idt_get_fw_data(struct idt_89hpesx_dev *pdev)else /* if (!fwnode_property_read_bool(node, "read-only")) */ pdev->eero = false; +fwnode_handle_put (fwnode);dev_info (dev,"EEPROM of %d bytes found by 0x%x" , pdev->eesize, pdev->eeaddr); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 198/421 eeprom: idt_89hpesx: Restore printing the unsupported fwnode name
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit e0db3deea73ba418bf5dc21f5a4e32ca87d16dde ]
When iterating over child firmware nodes restore printing the name of ones that are not supported.
While at it, refactor loop body to clearly show that we stop at the first match.
--- drivers/misc/eeprom/idt_89hpesx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/misc/eeprom/idt_89hpesx.c +3 -4
@@ -1128,11 +1128,10 @@ static void idt_get_fw_data(struct idt_89hpesx_dev *pdev)device_for_each_child_node (dev, fwnode) { ee_id =idt_ee_match_id (fwnode); -if (!ee_id) { -dev_warn (dev,"Skip unsupported EEPROM device" ); -continue ; - }else +if (ee_id)break ; + +dev_warn (dev,"Skip unsupported EEPROM device %pfw\n" , fwnode); }/* If there is no fwnode EEPROM device, then set zero size */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 199/421 iio: adc: hx711: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit afe2a789fbf7acd1a05407fc7839cc08d23825e3 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Found during an audit of all calls of this function.
--- drivers/iio/adc/hx711.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/hx711.c +2 -2
@@ -94,9 +94,9 @@ struct hx711_data {struct mutex lock;/* * triggered buffer -* 2x32-bit channel + 64-bit timestamp +* 2x32-bit channel + 64-bit naturally aligned timestamp */ -u32 buffer[4 ]; +u32 buffer[4 ]__aligned(8) ;/* * delay after a rising edge on SCK until the data is ready DOUT * this is dependent on the hx711 where the datasheet tells a
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 200/421 iio: adc: mxs-lradc: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 6a6be221b8bd561b053f0701ec752a5ed9007f69 ]
To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned.
Add a comment on why the buffer is the size it is as not immediately obvious.
Found during an audit of all calls of this function.
--- drivers/iio/adc/mxs-lradc-adc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/adc/mxs-lradc-adc.c +2 -1
@@ -124,7 +124,8 @@ struct mxs_lradc_adc {struct device *dev;void __iomem *base; -u32 buffer[10 ]; +/* Maximum of 8 channels + 8 byte ts */ +u32 buffer[10 ]__aligned(8) ;struct iio_trigger *trig;struct completion completion;spinlock_t lock;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 201/421 iio: adc: ti-ads8688: Fix alignment of buffer in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 61fa5dfa5f52806f5ce37a0ba5712c271eb22f98 ]
Add __aligned(8) to ensure the buffer passed to iio_push_to_buffers_with_timestamp() is suitable for the naturally aligned timestamp that will be inserted.
--- drivers/iio/adc/ti-ads8688.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/adc/ti-ads8688.c +2 -1
@@ -386,7 +386,8 @@ static irqreturn_t ads8688_trigger_handler(int irq, void *p) {struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev; -u16 buffer[ADS8688_MAX_CHANNELS +sizeof (s64)/sizeof (u16)]; +/* Ensure naturally aligned timestamp */ +u16 buffer[ADS8688_MAX_CHANNELS +sizeof (s64)/sizeof (u16)]__aligned(8) ;int i, j =0 ;for (i =0 ; i < indio_dev->masklength; i++) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 202/421 staging: gdm724x: check for buffer overflow in gdm_lte_multi_sdu_pkt()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4a36e160856db8a8ddd6a3d2e5db5a850ab87f82 ]
There needs to be a check to verify that we don't read beyond the end of "buf". This function is called from do_rx(). The "buf" is the USB transfer_buffer and "len" is "urb->actual_length".
--- drivers/staging/gdm724x/gdm_lte.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/staging/gdm724x/gdm_lte.c +9 -1
@@ -677,6 +677,7 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len)struct sdu *sdu =NULL ;u8 endian = phy_dev->get_endian (phy_dev->priv_dev);u8 *data = (u8 *)multi_sdu->data; +int copied;u16 i =0 ;u16 num_packet;u16 hci_len;
@@ -688,6 +689,12 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) num_packet =gdm_dev16_to_cpu (endian, multi_sdu->num_packet);for (i =0 ; i < num_packet; i++) { + copied = data - multi_sdu->data; +if (len < copied +sizeof (*sdu)) { +pr_err ("rx prevent buffer overflow" ); +return ; + } + sdu = (struct sdu *)data; cmd_evt =gdm_dev16_to_cpu (endian, sdu->cmd_evt);
@@ -698,7 +705,8 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len)pr_err ("rx sdu wrong hci %04x\n" , cmd_evt);return ; } -if (hci_len <12 ) { +if (hci_len <12 || + len < copied +sizeof (*sdu) + (hci_len -12 )) {pr_err ("rx sdu invalid len %d\n" , hci_len);return ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 203/421 staging: gdm724x: check for overflow in gdm_lte_netif_rx()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 7002b526f4ff1f6da34356e67085caafa6be383a ]
This code assumes that "len" is at least 62 bytes, but we need a check to prevent a read overflow.
--- drivers/staging/gdm724x/gdm_lte.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/gdm724x/gdm_lte.c +6 -4
@@ -611,10 +611,12 @@ static void gdm_lte_netif_rx(struct net_device *dev, char *buf,* bytes (99,130,83,99 dec) */ } __packed; -void *addr = buf +sizeof (struct iphdr ) + -sizeof (struct udphdr ) + - offsetof(struct dhcp_packet , chaddr); -ether_addr_copy (nic->dest_mac_addr, addr); +int offset =sizeof (struct iphdr ) + +sizeof (struct udphdr ) + + offsetof(struct dhcp_packet , chaddr); +if (offset +ETH_ALEN > len) +return ; +ether_addr_copy (nic->dest_mac_addr, buf + offset); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 204/421 staging: mt7621-dts: fix pci address for PCI memory range
In reply to Greg Kroah-HartmanFrom: Sergio Paracuellos <[email protected]>
[ Upstream commit 5b4f167ef3555ec4c334a8dc89c1b44bb2c6bff5 ]
Driver code call 'devm_of_pci_get_host_bridge_resources' to get resources and properly fill 'bridge->windows' and 'bridge->dma_ranges'. After parsing the ranges and store as resources, at the end it makes a call to pci function 'pci_add_resource_offset' to set the offset for the memory resource. To calculate offset, resource start address subtracts pci address of the range. MT7621 does not need any offset for the memory resource. Moreover, setting an offset got into 'WARN_ON' calls from pci devices driver code. Until now memory range pci_addr was being '0x00000000' and res->start is '0x60000000' but becase pci controller driver was manually setting resources and adding them using pci function 'pci_add_resource' where a zero is passed as offset, things was properly working. Since PCI_IOBASE is defined now for ralink we don't set nothing manually anymore so we have to properly fix PCI address for this range to make things work and the new pci address must be set to '0x60000000'. Doing in this way the subtract result obtain zero as offset and pci device driver code properly works.
--- drivers/staging/mt7621-dts/mt7621.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/mt7621-dts/mt7621.dtsi +1 -1
@@ -409,7 +409,7 @@ bus-range = <0 255>; ranges = < - 0x02000000 0 0x00000000 0x60000000 0 0x10000000 /* pci memory */ + 0x02000000 0 0x60000000 0x60000000 0 0x10000000 /* pci memory */ 0x01000000 0 0x00000000 0x1e160000 0 0x00010000 /* io space */ >;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 205/421 serial: 8250: Actually allow UPF_MAGIC_MULTIPLIER baud rates
In reply to Greg Kroah-HartmanFrom: Maciej W. Rozycki <[email protected]>
[ Upstream commit 78bcae8616ac277d6cb7f38e211493948ed73e30 ]
Support for magic baud rate divisors of 32770 and 32769 used with SMSC Super I/O chips for extra baud rates of 230400 and 460800 respectively where base rate is 115200[1] has been added around Linux 2.5.64, which predates our repo history, but the origin could be identified as commit 2a717aad772f ("Merge with Linux 2.5.64.") with the old MIPS/Linux repo also at: <git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux.git>.
Code that is now in serial8250_do_get_divisor' was added back then to serial8250_get_divisor', but that code would only ever trigger if one of the higher baud rates was actually requested, and that cannot ever happen, because the earlier call to serial8250_get_baud_rate' never returns them. This is because it calls uart_get_baud_rate' with the maximum requested being the base rate, that is clk/16 or 115200 for SMSC chips at their nominal clock rate.
Fix it then and allow UPF_MAGIC_MULTIPLIER baud rates to be selected, by requesting the maximum baud rate of clk/4 rather than clk/16 if the flag has been set. Also correct the minimum baud rate, observing that these ports only support actual (non-magic) divisors of up to 32767 only.
[1] "FDC37M81x, PC98/99 Compliant Enhanced Super I/O Controller with Keyboard/Mouse Wake-Up", Standard Microsystems Corporation, Rev. 03/27/2000, Table 31 - "Baud Rates", p. 77
--- drivers/tty/serial/8250/8250_port.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250_port.c +16 -3
@@ -2646,6 +2646,21 @@ static unsigned int serial8250_get_baud_rate(struct uart_port *port, struct ktermios *old) {unsigned int tolerance = port->uartclk /100 ; +unsigned int min; +unsigned int max; + +/* +* Handle magic divisors for baud rates above baud_base on SMSC +* Super I/O chips. Enable custom rates of clk/4 and clk/8, but +* disable divisor values beyond 32767, which are unavailable. +*/ +if (port->flags &UPF_MAGIC_MULTIPLIER ) { + min = port->uartclk /16 /UART_DIV_MAX >>1 ; + max = (port->uartclk + tolerance) /4 ; + }else { + min = port->uartclk /16 /UART_DIV_MAX ; + max = (port->uartclk + tolerance) /16 ; + }/* * Ask the core to calculate the divisor for us.
@@ -2653,9 +2668,7 @@ static unsigned int serial8250_get_baud_rate(struct uart_port *port,* slower than nominal still match standard baud rates without * causing transmission errors. */ -return uart_get_baud_rate (port, termios, old, - port->uartclk /16 /UART_DIV_MAX , - (port->uartclk + tolerance) /16 ); +return uart_get_baud_rate (port, termios, old, min, max); }void
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 206/421 iio: prox: isl29501: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 92babc9938ebbf4050f2fba774836f7edc16a570 ]
Add __aligned(8) to ensure the buffer passed to iio_push_to_buffers_with_timestamp() is suitable for the naturally aligned timestamp that will be inserted.
Here an explicit structure is not used, because the holes would necessitate the addition of an explict memset(), to avoid a kernel data leak, making for a less minimal fix.
--- drivers/iio/proximity/isl29501.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/proximity/isl29501.c +1 -1
@@ -946,7 +946,7 @@ static irqreturn_t isl29501_trigger_handler(int irq, void *p)struct iio_dev *indio_dev = pf->indio_dev;struct isl29501_private *isl29501 =iio_priv (indio_dev);const unsigned long *active_mask = indio_dev->active_scan_mask; -u32 buffer[4 ] = {};/* 1x16-bit + ts */ +u32 buffer[4 ]__aligned(8) = {};/* 1x16-bit + naturally aligned ts */ if (test_bit (ISL29501_DISTANCE_SCAN_INDEX , active_mask))isl29501_register_read (isl29501,REG_DISTANCE , buffer);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 207/421 ASoC: cs42l42: Correct definition of CS42L42_ADC_PDN_MASK
In reply to Greg Kroah-HartmanFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit fac165f22ac947b55407cd3a60a2a9824f905235 ]
The definition of CS42L42_ADC_PDN_MASK was incorrectly defined as the HP_PDN bit.
--- sound/soc/codecs/cs42l42.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs42l42.h +1 -1
@@ -81,7 +81,7 @@#define CS42L42_HP_PDN_SHIFT 3#define CS42L42_HP_PDN_MASK (1 << CS42L42_HP_PDN_SHIFT)#define CS42L42_ADC_PDN_SHIFT 2 -#define CS42L42_ADC_PDN_MASK (1 << CS42L42_HP_PDN_SHIFT) +#define CS42L42_ADC_PDN_MASK (1 << CS42L42_ADC_PDN_SHIFT)#define CS42L42_PDN_ALL_SHIFT 0#define CS42L42_PDN_ALL_MASK (1 << CS42L42_PDN_ALL_SHIFT)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 208/421 of: Fix truncation of memory sizes on 32-bit platforms
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 2892d8a00d23d511a0591ac4b2ff3f050ae1f004 ]
Variable "size" has type "phys_addr_t", which can be either 32-bit or 64-bit on 32-bit systems, while "unsigned long" is always 32-bit on 32-bit systems. Hence the cast in
(unsigned long)size / SZ_1M
may truncate a 64-bit size to 32-bit, as casts have a higher operator precedence than divisions.
Fix this by inverting the order of the cast and division, which should be safe for memory blocks smaller than 4 PiB. Note that the division is actually a shift, as SZ_1M is a power-of-two constant, hence there is no need to use div_u64().
While at it, use "%lu" to format "unsigned long".
--- drivers/of/fdt.c | 8 ++++---- drivers/of/of_reserved_mem.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/of/fdt.c +4 -4
@@ -576,11 +576,11 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,if (size &&early_init_dt_reserve_memory_arch (base, size, nomap) ==0 ) -pr_debug ("Reserved memory: reserved region for node '%s': base %pa, size %ld MiB\n" , - uname, &base, (unsigned long )size /SZ_1M ); +pr_debug ("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n" , + uname, &base, (unsigned long )(size /SZ_1M ));else -pr_info ("Reserved memory: failed to reserve memory for node '%s': base %pa, size %ld MiB\n" , - uname, &base, (unsigned long )size /SZ_1M ); +pr_info ("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n" , + uname, &base, (unsigned long )(size /SZ_1M )); len -= t_len;if (first) {
drivers/of/of_reserved_mem.c +4 -4
@@ -154,9 +154,9 @@ static int __init __reserved_mem_alloc_size(unsigned long node, ret =early_init_dt_alloc_reserved_memory_arch (size, align, start, end, nomap, &base);if (ret ==0 ) { -pr_debug ("allocated memory for '%s' node: base %pa, size %ld MiB\n" , +pr_debug ("allocated memory for '%s' node: base %pa, size %lu MiB\n" , uname, &base, - (unsigned long )size /SZ_1M ); + (unsigned long )(size /SZ_1M ));break ; } len -= t_len;
@@ -166,8 +166,8 @@ static int __init __reserved_mem_alloc_size(unsigned long node, ret =early_init_dt_alloc_reserved_memory_arch (size, align,0 ,0 , nomap, &base);if (ret ==0 ) -pr_debug ("allocated memory for '%s' node: base %pa, size %ld MiB\n" , - uname, &base, (unsigned long )size /SZ_1M ); +pr_debug ("allocated memory for '%s' node: base %pa, size %lu MiB\n" , + uname, &base, (unsigned long )(size /SZ_1M )); }if (base ==0 ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 209/421 mtd: rawnand: marvell: add missing clk_disable_unprepare() on error in marvell_nfc_resume()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ae94c49527aa9bd3b563349adc4b5617747ca6bd ]
Add clk_disable_unprepare() on error path in marvell_nfc_resume().
--- drivers/mtd/nand/raw/marvell_nand.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/marvell_nand.c +3 -1
@@ -2880,8 +2880,10 @@ static int __maybe_unused marvell_nfc_resume(struct device *dev)return ret; ret =clk_prepare_enable (nfc->reg_clk); -if (ret <0 ) +if (ret <0 ) { +clk_disable_unprepare (nfc->core_clk);return ret; + }/* * Reset nfc->selected_chip so the next command will cause the timing
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 210/421 scsi: mpt3sas: Fix error return value in _scsih_expander_add()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit d6c2ce435ffe23ef7f395ae76ec747414589db46 ]
When an expander does not contain any 'phys', an appropriate error code -1 should be returned, as done elsewhere in this function. However, we currently do not explicitly assign this error code to 'rc'. As a result, 0 was incorrectly returned.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +3 -1
@@ -5745,8 +5745,10 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) handle, parent_handle, (unsigned long long ) sas_expander->sas_address, sas_expander->num_phys); -if (!sas_expander->num_phys) +if (!sas_expander->num_phys) { + rc =-1 ; goto out_fail; + } sas_expander->phy =kcalloc (sas_expander->num_phys,sizeof (struct _sas_phy ),GFP_KERNEL );if (!sas_expander->phy) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 211/421 phy: ti: dm816x: Fix the error handling path in dm816x_usb_phy_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit f7eedcb8539ddcbb6fe7791f1b4ccf43f905c72f ]
Add an error handling path in the probe to release some resources, as already done in the remove function.
--- drivers/phy/ti/phy-dm816x-usb.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/phy/ti/phy-dm816x-usb.c +13 -4
@@ -246,19 +246,28 @@ static int dm816x_usb_phy_probe(struct platform_device *pdev)pm_runtime_enable (phy->dev); generic_phy =devm_phy_create (phy->dev,NULL , &ops); -if (IS_ERR (generic_phy)) -return PTR_ERR (generic_phy); +if (IS_ERR (generic_phy)) { + error =PTR_ERR (generic_phy); + goto clk_unprepare; + }phy_set_drvdata (generic_phy, phy); phy_provider =devm_of_phy_provider_register (phy->dev, of_phy_simple_xlate); -if (IS_ERR (phy_provider)) -return PTR_ERR (phy_provider); +if (IS_ERR (phy_provider)) { + error =PTR_ERR (phy_provider); + goto clk_unprepare; + }usb_add_phy_dev (&phy->phy);return 0 ; + +clk_unprepare: +pm_runtime_disable (phy->dev); +clk_unprepare (phy->refclk); +return error; }static int dm816x_usb_phy_remove (struct platform_device *pdev)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 212/421 extcon: sm5502: Drop invalid register write in sm5502_reg_data
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit d25b224f8e5507879b36a769a6d1324cf163466c ]
When sm5502_init_dev_type() iterates over sm5502_reg_data to initialize the registers it is limited by ARRAY_SIZE(sm5502_reg_data). There is no need to add another empty element to sm5502_reg_data.
Having the additional empty element in sm5502_reg_data will just result in writing 0xff to register 0x00, which does not really make sense.
--- drivers/extcon/extcon-sm5502.c | 1 - 1 file changed, 1 deletion(-)
drivers/extcon/extcon-sm5502.c +0 -1
@@ -92,7 +92,6 @@ static struct reg_data sm5502_reg_data[] = { | SM5502_REG_INTM2_MHL_MASK, .invert = true, }, - { } };/* List of detectable cables */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 213/421 extcon: max8997: Add missing modalias string
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit dc11fc2991e9efbceef93912b83e333d2835fb19 ]
The platform device driver name is "max8997-muic", so advertise it properly in the modalias string. This fixes automated module loading when this driver is compiled as a module.
--- drivers/extcon/extcon-max8997.c | 1 + 1 file changed, 1 insertion(+)
drivers/extcon/extcon-max8997.c +1 -0
@@ -783,3 +783,4 @@ module_platform_driver(max8997_muic_driver);MODULE_DESCRIPTION ("Maxim MAX8997 Extcon driver" );MODULE_AUTHOR ("Donggeun Kim <[email protected]>" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:max8997-muic" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 214/421 ASoC: atmel-i2s: Fix usage of capture and playback at the same time
In reply to Greg Kroah-HartmanFrom: Codrin Ciubotariu <[email protected]>
[ Upstream commit 3b7961a326f8a7e03f54a19f02fedae8d488b80f ]
For both capture and playback streams to work at the same time, only the needed values from a register need to be updated. Also, clocks should be enabled only when the first stream is started and stopped when there is no running stream.
--- sound/soc/atmel/atmel-i2s.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-)
sound/soc/atmel/atmel-i2s.c +26 -8
@@ -211,6 +211,7 @@ struct atmel_i2s_dev {unsigned int fmt;const struct atmel_i2s_gck_param *gck_param;const struct atmel_i2s_caps *caps; +int clk_use_no; };static irqreturn_t atmel_i2s_interrupt (int irq,void *dev_id)
@@ -332,9 +333,16 @@ static int atmel_i2s_hw_params(struct snd_pcm_substream *substream, {struct atmel_i2s_dev *dev =snd_soc_dai_get_drvdata (dai);bool is_playback = (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ); -unsigned int mr =0 ; +unsigned int mr =0 , mr_mask;int ret; + mr_mask =ATMEL_I2SC_MR_FORMAT_MASK |ATMEL_I2SC_MR_MODE_MASK | +ATMEL_I2SC_MR_DATALENGTH_MASK ; +if (is_playback) + mr_mask |=ATMEL_I2SC_MR_TXMONO ; +else + mr_mask |=ATMEL_I2SC_MR_RXMONO ; +switch (dev->fmt &SND_SOC_DAIFMT_FORMAT_MASK ) {case SND_SOC_DAIFMT_I2S : mr |=ATMEL_I2SC_MR_FORMAT_I2S ;
@@ -413,7 +421,7 @@ static int atmel_i2s_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } -return regmap_write (dev->regmap,ATMEL_I2SC_MR , mr); +return regmap_update_bits (dev->regmap,ATMEL_I2SC_MR , mr_mask, mr); } static int atmel_i2s_switch_mck_generator(struct atmel_i2s_dev *dev,
@@ -506,18 +514,28 @@ static int atmel_i2s_trigger(struct snd_pcm_substream *substream, int cmd, is_master = (mr &ATMEL_I2SC_MR_MODE_MASK ) ==ATMEL_I2SC_MR_MODE_MASTER ;/* If master starts, enable the audio clock. */ -if (is_master && mck_enabled) - err =atmel_i2s_switch_mck_generator (dev, true); -if (err) -return err; +if (is_master && mck_enabled) { +if (!dev->clk_use_no) { + err =atmel_i2s_switch_mck_generator (dev, true); +if (err) +return err; + } + dev->clk_use_no++; + } err =regmap_write (dev->regmap,ATMEL_I2SC_CR , cr);if (err)return err;/* If master stops, disable the audio clock. */ -if (is_master && !mck_enabled) - err =atmel_i2s_switch_mck_generator (dev, false); +if (is_master && !mck_enabled) { +if (dev->clk_use_no ==1 ) { + err =atmel_i2s_switch_mck_generator (dev, false); +if (err) +return err; + } + dev->clk_use_no--; + }return err; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 215/421 configfs: fix memleak in configfs_release_bin_file
In reply to Greg Kroah-HartmanFrom: Chung-Chiang Cheng <[email protected]>
[ Upstream commit 3c252b087de08d3cb32468b54a158bd7ad0ae2f7 ]
When reading binary attributes in progress, buffer->bin_buffer is setup in configfs_read_bin_file() but never freed.
--- fs/configfs/file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/configfs/file.c +5 -5
@@ -496,13 +496,13 @@ static int configfs_release_bin_file(struct inode *inode, struct file *file) buffer->bin_buffer_size); }up_read (&frag->frag_sem); -/* vfree on NULL is safe */ -vfree (buffer->bin_buffer); - buffer->bin_buffer =NULL ; - buffer->bin_buffer_size =0 ; - buffer->needs_read_fill =1 ; } +vfree (buffer->bin_buffer); + buffer->bin_buffer =NULL ; + buffer->bin_buffer_size =0 ; + buffer->needs_read_fill =1 ; +configfs_release (inode, file);return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 216/421 leds: as3645a: Fix error return code in as3645a_parse_node()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit 96a30960a2c5246c8ffebe8a3c9031f9df094d97 ]
Return error code -ENODEV rather than '0' when the indicator node can not be found.
--- drivers/leds/leds-as3645a.c | 1 + 1 file changed, 1 insertion(+)
drivers/leds/leds-as3645a.c +1 -0
@@ -565,6 +565,7 @@ static int as3645a_parse_node(struct as3645a *flash,if (!flash->indicator_node) {dev_warn (&flash->client->dev,"can't find indicator node\n" ); + rval = -ENODEV ; goto out_err; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 217/421 leds: ktd2692: Fix an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit ee78b9360e14c276f5ceaa4a0d06f790f04ccdad ]
In 'ktd2692_parse_dt()', if an error occurs after a successful 'regulator_enable()' call, we should call 'regulator_enable()'.
This is the same in 'ktd2692_probe()', if an error occurs after a successful 'ktd2692_parse_dt()' call.
Instead of adding 'regulator_enable()' in several places, implement a resource managed solution and simplify the remove function accordingly.
--- drivers/leds/leds-ktd2692.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
drivers/leds/leds-ktd2692.c +18 -9
@@ -259,6 +259,17 @@ static void ktd2692_setup(struct ktd2692_context *led) | KTD2692_REG_FLASH_CURRENT_BASE); } +static void regulator_disable_action (void *_data) +{ +struct device *dev = _data; +struct ktd2692_context *led =dev_get_drvdata (dev); +int ret; + + ret =regulator_disable (led->regulator); +if (ret) +dev_err (dev,"Failed to disable supply: %d\n" , ret); +} +static int ktd2692_parse_dt (struct ktd2692_context *led,struct device *dev,struct ktd2692_led_config_data *cfg) {
@@ -289,8 +300,14 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,if (led->regulator) { ret =regulator_enable (led->regulator); -if (ret) +if (ret) {dev_err (dev,"Failed to enable supply: %d\n" , ret); + }else { + ret =devm_add_action_or_reset (dev, + regulator_disable_action, dev); +if (ret) +return ret; + } } child_node =of_get_next_available_child (np,NULL );
@@ -380,17 +397,9 @@ static int ktd2692_probe(struct platform_device *pdev)static int ktd2692_remove (struct platform_device *pdev) {struct ktd2692_context *led =platform_get_drvdata (pdev); -int ret;led_classdev_flash_unregister (&led->fled_cdev); -if (led->regulator) { - ret =regulator_disable (led->regulator); -if (ret) -dev_err (&pdev->dev, -"Failed to disable supply: %d\n" , ret); - } -mutex_destroy (&led->lock);return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 218/421 powerpc: Offline CPU in stop_this_cpu()
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit bab26238bbd44d5a4687c0a64fd2c7f2755ea937 ]
printk_safe_flush_on_panic() has special lock breaking code for the case where we panic()ed with the console lock held. It relies on panic IPI causing other CPUs to mark themselves offline.
Do as most other architectures do.
This effectively reverts commit de6e5d38417e ("powerpc: smp_send_stop do not offline stopped CPUs"), unfortunately it may result in some false positive warnings, but the alternative is more situations where we can crash without getting messages out.
--- arch/powerpc/kernel/smp.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/powerpc/kernel/smp.c +11 -0
@@ -570,6 +570,8 @@ static void nmi_stop_this_cpu(struct pt_regs *regs)/* * IRQs are already hard disabled by the smp_handle_nmi_ipi. */ +set_cpu_online (smp_processor_id (), false); +spin_begin ();while (1 )spin_cpu_relax ();
@@ -585,6 +587,15 @@ void smp_send_stop(void)static void stop_this_cpu (void *dummy) {hard_irq_disable (); + +/* +* Offlining CPUs in stop_this_cpu can result in scheduler warnings, +* (see commit de6e5d38417e), but printk_safe_flush_on_panic() wants +* to know other CPUs are offline before it breaks locks to flush +* printk buffers, in case we panic()ed while holding the lock. +*/ +set_cpu_online (smp_processor_id (), false); +spin_begin ();while (1 )spin_cpu_relax ();
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 219/421 serial: mvebu-uart: correctly calculate minimal possible baudrate
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit deeaf963569a0d9d1b08babb771f61bb501a5704 ]
For default (x16) scheme which is currently used by mvebu-uart.c driver, maximal divisor of UART base clock is 1023*16. Therefore there is limit for minimal supported baudrate. This change calculate it correctly and prevents setting invalid divisor 0 into hardware registers.
--- drivers/tty/serial/mvebu-uart.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/tty/serial/mvebu-uart.c +8 -3
@@ -471,7 +471,7 @@ static void mvebu_uart_set_termios(struct uart_port *port, struct ktermios *old) {unsigned long flags; -unsigned int baud; +unsigned int baud, min_baud, max_baud;spin_lock_irqsave (&port->lock, flags);
@@ -490,16 +490,21 @@ static void mvebu_uart_set_termios(struct uart_port *port, port->ignore_status_mask |=STAT_RX_RDY (port) |STAT_BRK_ERR ;/* +* Maximal divisor is 1023 * 16 when using default (x16) scheme. * Maximum achievable frequency with simple baudrate divisor is 230400. * Since the error per bit frame would be of more than 15%, achieving * higher frequencies would require to implement the fractional divisor * feature. */ - baud =uart_get_baud_rate (port, termios, old,0 ,230400 ); + min_baud =DIV_ROUND_UP (port->uartclk,1023 *16 ); + max_baud =230400 ; + + baud =uart_get_baud_rate (port, termios, old, min_baud, max_baud);if (mvebu_uart_baud_rate_set (port, baud)) {/* No clock available, baudrate cannot be changed */ if (old) - baud =uart_get_baud_rate (port, old,NULL ,0 ,230400 ); + baud =uart_get_baud_rate (port, old,NULL , + min_baud, max_baud); }else {tty_termios_encode_baud_rate (termios, baud, baud);uart_update_timeout (port, termios->c_cflag, baud);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 220/421 arm64: dts: marvell: armada-37xx: Fix reg for standard variant of UART
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 2cbfdedef39fb5994b8f1e1df068eb8440165975 ]
UART1 (standard variant with DT node name 'uart0') has register space 0x12000-0x12018 and not whole size 0x200. So fix also this in example.
--- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +1 -1
@@ -121,7 +121,7 @@ uart0: serial@12000 { compatible = "marvell,armada-3700-uart"; - reg = <0x12000 0x200>; + reg = <0x12000 0x18>; clocks = <&xtalclk>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 221/421 vfio/pci: Handle concurrent vma faults
In reply to Greg Kroah-HartmanFrom: Alex Williamson <[email protected]>
[ Upstream commit 6a45ece4c9af473555f01f0f8b97eba56e3c7d0d ]
io_remap_pfn_range() will trigger a BUG_ON if it encounters a populated pte within the mapping range. This can occur because we map the entire vma on fault and multiple faults can be blocked behind the vma_lock. This leads to traces like the one reported below.
We can use our vma_list to test whether a given vma is mapped to avoid this issue.
[ 1591.733256] kernel BUG at mm/memory.c:2177! [ 1591.739515] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP [ 1591.747381] Modules linked in: vfio_iommu_type1 vfio_pci vfio_virqfd vfio pv680_mii(O) [ 1591.760536] CPU: 2 PID: 227 Comm: lcore-worker-2 Tainted: G O 5.11.0-rc3+ #1 [ 1591.770735] Hardware name: , BIOS HixxxxFPGA 1P B600 V121-1 [ 1591.778872] pstate: 40400009 (nZcv daif +PAN -UAO -TCO BTYPE=--) [ 1591.786134] pc : remap_pfn_range+0x214/0x340 [ 1591.793564] lr : remap_pfn_range+0x1b8/0x340 [ 1591.799117] sp : ffff80001068bbd0 [ 1591.803476] x29: ffff80001068bbd0 x28: 0000042eff6f0000 [ 1591.810404] x27: 0000001100910000 x26: 0000001300910000 [ 1591.817457] x25: 0068000000000fd3 x24: ffffa92f1338e358 [ 1591.825144] x23: 0000001140000000 x22: 0000000000000041 [ 1591.832506] x21: 0000001300910000 x20: ffffa92f141a4000 [ 1591.839520] x19: 0000001100a00000 x18: 0000000000000000 [ 1591.846108] x17: 0000000000000000 x16: ffffa92f11844540 [ 1591.853570] x15: 0000000000000000 x14: 0000000000000000 [ 1591.860768] x13: fffffc0000000000 x12: 0000000000000880 [ 1591.868053] x11: ffff0821bf3d01d0 x10: ffff5ef2abd89000 [ 1591.875932] x9 : ffffa92f12ab0064 x8 : ffffa92f136471c0 [ 1591.883208] x7 : 0000001140910000 x6 : 0000000200000000 [ 1591.890177] x5 : 0000000000000001 x4 : 0000000000000001 [ 1591.896656] x3 : 0000000000000000 x2 : 0168044000000fd3 [ 1591.903215] x1 : ffff082126261880 x0 : fffffc2084989868 [ 1591.910234] Call trace: [ 1591.914837] remap_pfn_range+0x214/0x340 [ 1591.921765] vfio_pci_mmap_fault+0xac/0x130 [vfio_pci] [ 1591.931200] __do_fault+0x44/0x12c [ 1591.937031] handle_mm_fault+0xcc8/0x1230 [ 1591.942475] do_page_fault+0x16c/0x484 [ 1591.948635] do_translation_fault+0xbc/0xd8 [ 1591.954171] do_mem_abort+0x4c/0xc0 [ 1591.960316] el0_da+0x40/0x80 [ 1591.965585] el0_sync_handler+0x168/0x1b0 [ 1591.971608] el0_sync+0x174/0x180 [ 1591.978312] Code: eb1b027f 540000c0 f9400022 b4fffe02 (d4210000)
--- drivers/vfio/pci/vfio_pci.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/vfio/pci/vfio_pci.c +21 -8
@@ -1359,6 +1359,7 @@ static vm_fault_t vfio_pci_mmap_fault(struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct vfio_pci_device *vdev = vma->vm_private_data; +struct vfio_pci_mmap_vma *mmap_vma;vm_fault_t ret =VM_FAULT_NOPAGE ;mutex_lock (&vdev->vma_lock);
@@ -1366,24 +1367,36 @@ static vm_fault_t vfio_pci_mmap_fault(struct vm_fault *vmf)if (!__vfio_pci_memory_enabled (vdev)) { ret =VM_FAULT_SIGBUS ; -mutex_unlock (&vdev->vma_lock); goto up_out; } -if (__vfio_pci_add_vma (vdev, vma)) { - ret =VM_FAULT_OOM ; -mutex_unlock (&vdev->vma_lock); - goto up_out; +/* +* We populate the whole vma on fault, so we need to test whether +* the vma has already been mapped, such as for concurrent faults +* to the same vma. io_remap_pfn_range() will trigger a BUG_ON if +* we ask it to fill the same range again. +*/ +list_for_each_entry (mmap_vma, &vdev->vma_list, vma_next) { +if (mmap_vma->vma == vma) + goto up_out; } -mutex_unlock (&vdev->vma_lock); -if (io_remap_pfn_range (vma, vma->vm_start, vma->vm_pgoff, - vma->vm_end - vma->vm_start, vma->vm_page_prot)) + vma->vm_end - vma->vm_start, + vma->vm_page_prot)) { ret =VM_FAULT_SIGBUS ; +zap_vma_ptes (vma, vma->vm_start, vma->vm_end - vma->vm_start); + goto up_out; + } + +if (__vfio_pci_add_vma (vdev, vma)) { + ret =VM_FAULT_OOM ; +zap_vma_ptes (vma, vma->vm_start, vma->vm_end - vma->vm_start); + } up_out:up_read (&vdev->memory_lock); +mutex_unlock (&vdev->vma_lock);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 222/421 mm/huge_memory.c: dont discard hugepage if other processes are mapping it
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
[ Upstream commit babbbdd08af98a59089334eb3effbed5a7a0cf7f ]
If other processes are mapping any other subpages of the hugepage, i.e. in pte-mapped thp case, page_mapcount() will return 1 incorrectly. Then we would discard the page while other processes are still mapping it. Fix it by using total_mapcount() which can tell whether other processes are still mapping it.
--- mm/huge_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/huge_memory.c +1 -1
@@ -1692,7 +1692,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,* If other processes are mapping this page, we couldn't discard * the page unless they all do MADV_FREE so let's skip the page. */ -if (page_mapcount (page) !=1 ) +if (total_mapcount (page) !=1 ) goto out;if (!trylock_page (page))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 223/421 selftests/vm/pkeys: fix alloc_random_pkey() to make it really, really random
In reply to Greg Kroah-HartmanFrom: Dave Hansen <[email protected]>
[ Upstream commit f36ef407628835a7d7fb3d235b1f1aac7022d9a3 ]
Patch series "selftests/vm/pkeys: Bug fixes and a new test".
There has been a lot of activity on the x86 front around the XSAVE architecture which is used to context-switch processor state (among other things). In addition, AMD has recently joined the protection keys club by adding processor support for PKU.
The AMD implementation helped uncover a kernel bug around the PKRU "init state", which actually applied to Intel's implementation but was just harder to hit. This series adds a test which is expected to help find this class of bug both on AMD and Intel. All the work around pkeys on x86 also uncovered a few bugs in the selftest.
This patch (of 4):
The "random" pkey allocation code currently does the good old:
srand((unsigned int)time(NULL));
*But*, it unfortunately does this on every random pkey allocation.
There may be thousands of these a second. time() has a one second resolution. So, each time alloc_random_pkey() is called, the PRNG is *RESET* to time(). This is nasty. Normally, if you do:
srand(<ANYTHING>); foo = rand(); bar = rand();
You'll be quite guaranteed that 'foo' and 'bar' are different. But, if you do:
srand(1); foo = rand(); srand(1); bar = rand();
You are quite guaranteed that 'foo' and 'bar' are the *SAME*. The recent "fix" effectively forced the test case to use the same "random" pkey for the whole test, unless the test run crossed a second boundary.
Only run srand() once at program startup.
This explains some very odd and persistent test failures I've been seeing.
--- tools/testing/selftests/x86/protection_keys.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/x86/protection_keys.c +2 -1
@@ -613,7 +613,6 @@ int alloc_random_pkey(void)int nr_alloced =0 ;int random_index;memset (alloced_pkeys,0 ,sizeof (alloced_pkeys)); -srand ((unsigned int )time (NULL ));/* allocate every possible key and make a note of which ones we got */ max_nr_pkey_allocs =NR_PKEYS ;
@@ -1479,6 +1478,8 @@ int main(void) {int nr_iterations =22 ; +srand ((unsigned int )time (NULL )); +setup_handlers ();printf ("has pku: %d\n" ,cpu_has_pku ());
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 224/421 perf llvm: Return -ENOMEM when asprintf() fails
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit c435c166dcf526ac827bc964d82cc0d5e7a1fd0b ]
Zhihao sent a patch but it made llvm__compile_bpf() return what asprintf() returns on error, which is just -1, but since this function returns -errno, fix it by returning -ENOMEM for this case instead.
--- tools/perf/util/llvm-utils.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/llvm-utils.c +2 -0
@@ -500,6 +500,7 @@ int llvm__compile_bpf(const char *path, goto errout; } + err = -ENOMEM ;if (asprintf (&pipe_template,"%s -emit-llvm | %s -march=bpf %s -filetype=obj -o -" , template, llc_path, opts) <0 ) {pr_err ("ERROR:\tnot enough memory to setup command line\n" );
@@ -520,6 +521,7 @@ int llvm__compile_bpf(const char *path,pr_debug ("llvm compiling command template: %s\n" , template); + err = -ENOMEM ;if (asprintf (&command_echo,"echo -n \"%s\"" , template) <0 ) goto errout;
Greg Kroah-Hartman
maintainerPATCH 225/421 mmc: block: Disable CMDQ on the ioctl path
In reply to Greg Kroah-HartmanFrom: Bean Huo <[email protected]>
commit 70b52f09080565030a530a784f1c9948a7f48ca3 upstream.
According to the eMMC Spec:
"When command queuing is enabled (CMDQ Mode En bit in CMDQ_MODE_EN field is set to ‘1’) class 11 commands are the only method through which data transfer tasks can be issued. Existing data transfer commands, namely CMD18/CMD17 and CMD25/CMD24, are not supported when command queuing is enabled."
which means if CMDQ is enabled, the FFU commands will not be supported. To fix this issue, just simply disable CMDQ on the ioctl path, and re-enable CMDQ once ioctl request is completed.
--- drivers/mmc/core/block.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/mmc/core/block.c +8 -0
@@ -1054,6 +1054,12 @@ static void mmc_blk_issue_drv_op(structswitch (mq_rq->drv_op) {case MMC_DRV_OP_IOCTL : +if (card->ext_csd.cmdq_en) { + ret =mmc_cmdq_disable (card); +if (ret) +break ; + } +/* fallthrough */ case MMC_DRV_OP_IOCTL_RPMB : idata = mq_rq->drv_op_data;for (i =0 , ret =0 ; i < mq_rq->ioc_count; i++) {
@@ -1064,6 +1070,8 @@ static void mmc_blk_issue_drv_op(struct/* Always switch back to main area after RPMB access */ if (rpmb_ioctl)mmc_blk_part_switch (card,0 ); +else if (card->reenable_cmdq && !card->ext_csd.cmdq_en) +mmc_cmdq_enable (card);break ;case MMC_DRV_OP_BOOT_WP : ret = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BOOT_WP,
Greg Kroah-Hartman
maintainerPATCH 226/421 mmc: vub3000: fix control-request direction
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 3c0bb3107703d2c58f7a0a7a2060bb57bc120326 upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Fix the SET_ROM_WAIT_STATES request which erroneously used usb_rcvctrlpipe().
--- drivers/mmc/host/vub300.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/vub300.c +1 -1
@@ -2289,7 +2289,7 @@ static int vub300_probe(struct usb_interif (retval <0 ) goto error5; retval = -usb_control_msg (vub300->udev,usb_rcvctrlpipe (vub300->udev,0 ), +usb_control_msg (vub300->udev,usb_sndctrlpipe (vub300->udev,0 ),SET_ROM_WAIT_STATES ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , firmware_rom_wait_states,0x0000 ,NULL ,0 ,HZ );
Greg Kroah-Hartman
maintainerPATCH 227/421 drm/mxsfb: Dont select DRM_KMS_FB_HELPER
In reply to Greg Kroah-HartmanFrom: Thomas Zimmermann <[email protected]>
[ Upstream commit 13b29cc3a722c2c0bc9ab9f72f9047d55d08a2f9 ]
Selecting DRM_FBDEV_EMULATION will include the correct settings for fbdev emulation. Drivers should not override this.
--- drivers/gpu/drm/mxsfb/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/mxsfb/Kconfig +0 -1
@@ -9,7 +9,6 @@ config DRM_MXSFB depends on COMMON_CLK select DRM_MXS select DRM_KMS_HELPER - select DRM_KMS_FB_HELPER select DRM_KMS_CMA_HELPER select DRM_PANEL help
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 228/421 drm/zte: Dont select DRM_KMS_FB_HELPER
In reply to Greg Kroah-HartmanFrom: Thomas Zimmermann <[email protected]>
[ Upstream commit a50e74bec1d17e95275909660c6b43ffe11ebcf0 ]
Selecting DRM_FBDEV_EMULATION will include the correct settings for fbdev emulation. Drivers should not override this.
--- drivers/gpu/drm/zte/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/zte/Kconfig +0 -1
@@ -2,7 +2,6 @@ config DRM_ZTE tristate "DRM Support for ZTE SoCs" depends on DRM && ARCH_ZX select DRM_KMS_CMA_HELPER - select DRM_KMS_FB_HELPER select DRM_KMS_HELPER select SND_SOC_HDMI_CODEC if SND_SOC select VIDEOMODE_HELPERS
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 229/421 drm/amd/amdgpu/sriov disable all ip hw status by default
In reply to Greg Kroah-HartmanFrom: Jack Zhang <[email protected]>
[ Upstream commit 95ea3dbc4e9548d35ab6fbf67675cef8c293e2f5 ]
Disable all ip's hw status to false before any hw_init. Only set it to true until its hw_init is executed.
The old 5.9 branch has this change but somehow the 5.11 kernrel does not have this fix.
Without this change, sriov tdr have gfx IB test fail.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -2069,7 +2069,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) AMD_IP_BLOCK_TYPE_IH, }; -for (i =0 ; i <ARRAY_SIZE (ip_order); i++) { +for (i =0 ; i < adev->num_ip_blocks; i++) {int j;struct amdgpu_ip_block *block;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 230/421 net: pch_gbe: Use proper accessors to BE data in pch_ptp_match()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 443ef39b499cc9c6635f83238101f1bb923e9326 ]
Sparse is not happy about handling of strict types in pch_ptp_match():
.../pch_gbe_main.c:158:33: warning: incorrect type in argument 2 (different base types)
.../pch_gbe_main.c:158:33: expected unsigned short [usertype] uid_hi
.../pch_gbe_main.c:158:33: got restricted __be16 [usertype]
.../pch_gbe_main.c:158:45: warning: incorrect type in argument 3 (different base types)
.../pch_gbe_main.c:158:45: expected unsigned int [usertype] uid_lo
.../pch_gbe_main.c:158:45: got restricted __be32 [usertype]
.../pch_gbe_main.c:158:56: warning: incorrect type in argument 4 (different base types)
.../pch_gbe_main.c:158:56: expected unsigned short [usertype] seqid
.../pch_gbe_main.c:158:56: got restricted __be16 [usertype]
Fix that by switching to use proper accessors to BE data.
--- .../ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +6 -13
@@ -118,7 +118,7 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid) {u8 *data = skb->data;unsigned int offset; -u16 *hi, *id; +u16 hi, id;u32 lo;if (ptp_classify_raw (skb) ==PTP_CLASS_NONE )
@@ -129,14 +129,11 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid)if (skb->len < offset +OFF_PTP_SEQUENCE_ID +sizeof (seqid))return 0 ; - hi = (u16 *)(data + offset +OFF_PTP_SOURCE_UUID ); - id = (u16 *)(data + offset +OFF_PTP_SEQUENCE_ID ); + hi =get_unaligned_be16 (data + offset +OFF_PTP_SOURCE_UUID +0 ); + lo =get_unaligned_be32 (data + offset +OFF_PTP_SOURCE_UUID +2 ); + id =get_unaligned_be16 (data + offset +OFF_PTP_SEQUENCE_ID ); -memcpy (&lo, &hi[1 ],sizeof (lo)); - -return (uid_hi == *hi && - uid_lo == lo && - seqid == *id); +return (uid_hi == hi && uid_lo == lo && seqid == id); } static void
@@ -146,7 +143,6 @@ pch_rx_timestamp(struct pch_gbe_adapter *adapter, struct sk_buff *skb)struct pci_dev *pdev;u64 ns;u32 hi, lo, val; -u16 uid, seq;if (!adapter->hwts_rx_en)return ;
@@ -162,10 +158,7 @@ pch_rx_timestamp(struct pch_gbe_adapter *adapter, struct sk_buff *skb) lo =pch_src_uuid_lo_read (pdev); hi =pch_src_uuid_hi_read (pdev); - uid = hi &0xffff ; - seq = (hi >>16 ) &0xffff ; - -if (!pch_ptp_match (skb,htons (uid),htonl (lo),htons (seq))) +if (!pch_ptp_match (skb, hi, lo, hi >>16 )) goto out; ns =pch_rx_snap_read (pdev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 231/421 drm/amd/display: fix use_max_lb flag for 420 pixel formats
In reply to Greg Kroah-HartmanFrom: Dmytro Laktyushkin <[email protected]>
[ Upstream commit 8809a7a4afe90ad9ffb42f72154d27e7c47551ae ]
Right now the flag simply selects memory config 0 when flag is true however 420 modes benefit more from memory config 3.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c +6 -3
@@ -476,10 +476,13 @@ static enum lb_memory_config dpp1_dscl_find_lb_memory_config(struct dcn10_dpp *dint vtaps_c = scl_data->taps.v_taps_c;int ceil_vratio =dc_fixpt_ceil (scl_data->ratios.vert);int ceil_vratio_c =dc_fixpt_ceil (scl_data->ratios.vert_c); -enum lb_memory_config mem_cfg =LB_MEMORY_CONFIG_0 ; -if (dpp->base.ctx->dc->debug.use_max_lb) -return mem_cfg; +if (dpp->base.ctx->dc->debug.use_max_lb) { +if (scl_data->format ==PIXEL_FORMAT_420BPP8 + || scl_data->format ==PIXEL_FORMAT_420BPP10 ) +return LB_MEMORY_CONFIG_3 ; +return LB_MEMORY_CONFIG_0 ; + } dpp->base.caps->dscl_calc_lb_num_partitions ( scl_data,LB_MEMORY_CONFIG_1 , &num_part_y, &num_part_c);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 232/421 hugetlb: clear huge pte during flush function on mips platform
In reply to Greg Kroah-HartmanFrom: Bibo Mao <[email protected]>
[ Upstream commit 33ae8f801ad8bec48e886d368739feb2816478f2 ]
If multiple threads are accessing the same huge page at the same time, hugetlb_cow will be called if one thread write the COW huge page. And function huge_ptep_clear_flush is called to notify other threads to clear the huge pte tlb entry. The other threads clear the huge pte tlb entry and reload it from page table, the reload huge pte entry may be old.
This patch fixes this issue on mips platform, and it clears huge pte entry before notifying other threads to flush current huge page entry, it is similar with other architectures.
--- arch/mips/include/asm/hugetlb.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/mips/include/asm/hugetlb.h +7 -1
@@ -67,7 +67,13 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,static inline void huge_ptep_clear_flush (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -flush_tlb_page (vma, addr &huge_page_mask (hstate_vma (vma))); +/* +* clear the huge pte entry firstly, so that the other smp threads will +* not get old pte entry after finishing flush_tlb_page and before +* setting new huge pte entry +*/ +huge_ptep_get_and_clear (vma->vm_mm, addr, ptep); +flush_tlb_page (vma, addr); }static inline int huge_pte_none (pte_t pte)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 233/421 atm: iphase: fix possible use-after-free in ia_module_exit()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 1c72e6ab66b9598cac741ed397438a52065a8f1f ]
This module's remove path calls del_timer(). However, that function does not wait until the timer handler finishes. This means that the timer handler may still be running after the driver's remove function has finished, which would result in a use-after-free.
Fix by calling del_timer_sync(), which makes sure the timer handler has finished, and unable to re-schedule itself.
--- drivers/atm/iphase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/iphase.c +1 -1
@@ -3301,7 +3301,7 @@ static void __exit ia_module_exit(void) {pci_unregister_driver (&ia_driver); -del_timer (&ia_timer); +del_timer_sync (&ia_timer); }module_init (ia_module_init);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 234/421 mISDN: fix possible use-after-free in HFC_cleanup()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 009fc857c5f6fda81f2f7dd851b2d54193a8e733 ]
This module's remove path calls del_timer(). However, that function does not wait until the timer handler finishes. This means that the timer handler may still be running after the driver's remove function has finished, which would result in a use-after-free.
Fix by calling del_timer_sync(), which makes sure the timer handler has finished, and unable to re-schedule itself.
--- drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/mISDN/hfcpci.c +1 -1
@@ -2348,7 +2348,7 @@ static void __exitHFC_cleanup (void) {if (timer_pending (&hfc_tl)) -del_timer (&hfc_tl); +del_timer_sync (&hfc_tl);pci_unregister_driver (&hfc_driver); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 235/421 atm: nicstar: Fix possible use-after-free in nicstar_cleanup()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 34e7434ba4e97f4b85c1423a59b2922ba7dff2ea ]
This module's remove path calls del_timer(). However, that function does not wait until the timer handler finishes. This means that the timer handler may still be running after the driver's remove function has finished, which would result in a use-after-free.
Fix by calling del_timer_sync(), which makes sure the timer handler has finished, and unable to re-schedule itself.
--- drivers/atm/nicstar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/nicstar.c +1 -1
@@ -296,7 +296,7 @@ static void __exit nicstar_cleanup(void) {XPRINTK ("nicstar: nicstar_cleanup() called.\n" ); -del_timer (&ns_timer); +del_timer_sync (&ns_timer);pci_unregister_driver (&nicstar_driver);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 236/421 net: Treat __napi_schedule_irqoff() as __napi_schedule() on PREEMPT_RT
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 8380c81d5c4fced6f4397795a5ae65758272bbfd ]
__napi_schedule_irqoff() is an optimized version of __napi_schedule() which can be used where it is known that interrupts are disabled, e.g. in interrupt-handlers, spin_lock_irq() sections or hrtimer callbacks.
On PREEMPT_RT enabled kernels this assumptions is not true. Force- threaded interrupt handlers and spinlocks are not disabling interrupts and the NAPI hrtimer callback is forced into softirq context which runs with interrupts enabled as well.
Chasing all usage sites of __napi_schedule_irqoff() is a whack-a-mole game so make __napi_schedule_irqoff() invoke __napi_schedule() for PREEMPT_RT kernels.
The callers of ____napi_schedule() in the networking core have been audited and are correct on PREEMPT_RT kernels as well.
--- net/core/dev.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/core/dev.c +9 -2
@@ -5931,11 +5931,18 @@ EXPORT_SYMBOL(napi_schedule_prep);* __napi_schedule_irqoff - schedule for receive * @n: entry to schedule * -* Variant of __napi_schedule() assuming hard irqs are masked +* Variant of __napi_schedule() assuming hard irqs are masked. +* +* On PREEMPT_RT enabled kernels this maps to __napi_schedule() +* because the interrupt disabled assumption might not be true +* due to force-threaded interrupts and spinlock substitution. */ void __napi_schedule_irqoff (struct napi_struct *n) { -____napi_schedule (this_cpu_ptr (&softnet_data), n); +if (!IS_ENABLED (CONFIG_PREEMPT_RT )) +____napi_schedule (this_cpu_ptr (&softnet_data), n); +else +__napi_schedule (n); }EXPORT_SYMBOL (__napi_schedule_irqoff);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 237/421 reiserfs: add check for invalid 1st journal block
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit a149127be52fa7eaf5b3681a0317a2bbb772d5a9 ]
syzbot reported divide error in reiserfs.
The problem was in incorrect journal 1st block.
Syzbot's reproducer manualy generated wrong superblock with incorrect 1st block. In journal_init() wasn't any checks about this particular case.
For example, if 1st journal block is before superblock 1st block, it can cause zeroing important superblock members in do_journal_end().
--- fs/reiserfs/journal.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/reiserfs/journal.c +14 -0
@@ -2772,6 +2772,20 @@ int journal_init(struct super_block *sb, const char *j_dev_name, goto free_and_return; } +/* +* Sanity check to see if journal first block is correct. +* If journal first block is invalid it can cause +* zeroing important superblock members. +*/ +if (!SB_ONDISK_JOURNAL_DEVICE (sb) && +SB_ONDISK_JOURNAL_1st_BLOCK (sb) <SB_JOURNAL_1st_RESERVED_BLOCK (sb)) { +reiserfs_warning (sb,"journal-1393" , +"journal 1st super block is invalid: 1st reserved block %d, but actual 1st block is %d" , +SB_JOURNAL_1st_RESERVED_BLOCK (sb), +SB_ONDISK_JOURNAL_1st_BLOCK (sb)); + goto free_and_return; + } +if (journal_init_dev (sb, journal, j_dev_name) !=0 ) {reiserfs_warning (sb,"sh-462" ,"unable to initialize journal device" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 238/421 drm/virtio: Fix double free on probe failure
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
[ Upstream commit cec7f1774605a5ef47c134af62afe7c75c30b0ee ]
The virtio_gpu_init() will free vgdev and vgdev->vbufs on failure. But such failure will be caught by virtio_gpu_probe() and then virtio_gpu_release() will be called to do some cleanup which will free vgdev and vgdev->vbufs again. So let's set dev->dev_private to NULL to avoid double free.
--- drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/virtio/virtgpu_kms.c +1 -0
@@ -237,6 +237,7 @@ err_ttm: err_vbufs: vgdev->vdev->config->del_vqs (vgdev->vdev); err_vqs: + dev->dev_private =NULL ;kfree (vgdev);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 239/421 udf: Fix NULL pointer dereference in udf_symlink function
In reply to Greg Kroah-HartmanFrom: Arturo Giusti <[email protected]>
[ Upstream commit fa236c2b2d4436d9f19ee4e5d5924e90ffd7bb43 ]
In function udf_symlink, epos.bh is assigned with the value returned by udf_tgetblk. The function udf_tgetblk is defined in udf/misc.c and returns the value of sb_getblk function that could be NULL. Then, epos.bh is used without any check, causing a possible NULL pointer dereference when sb_getblk fails.
This fix adds a check to validate the value of epos.bh.
--- fs/udf/namei.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/udf/namei.c +4 -0
@@ -948,6 +948,10 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, iinfo->i_location.partitionReferenceNum, 0); epos.bh =udf_tgetblk (sb, block); +if (unlikely (!epos.bh)) { + err = -ENOMEM ; + goto out_no_entry; + }lock_buffer (epos.bh);memset (epos.bh->b_data,0x00 , bsize);set_buffer_uptodate (epos.bh);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 240/421 e100: handle eeprom as little endian
In reply to Greg Kroah-HartmanFrom: Jesse Brandeburg <[email protected]>
[ Upstream commit d4ef55288aa2e1b76033717242728ac98ddc4721 ]
Sparse tool was warning on some implicit conversions from little endian data read from the EEPROM on the e100 cards.
Fix these by being explicit about the conversions using le16_to_cpu().
--- drivers/net/ethernet/intel/e100.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/e100.c +6 -6
@@ -1398,7 +1398,7 @@ static int e100_phy_check_without_mii(struct nic *nic)u8 phy_type;int without_mii; - phy_type = (nic->eeprom[eeprom_phy_iface] >>8 ) &0x0f ; + phy_type = (le16_to_cpu (nic->eeprom[eeprom_phy_iface]) >>8 ) &0x0f ;switch (phy_type) {case NoSuchPhy:/* Non-MII PHY; UNTESTED! */
@@ -1518,7 +1518,7 @@ static int e100_phy_init(struct nic *nic)mdio_write (netdev, nic->mii.phy_id,MII_BMCR , bmcr); }else if ((nic->mac >= mac_82550_D102) || ((nic->flags & ich) && (mdio_read (netdev, nic->mii.phy_id,MII_TPISTATUS ) &0x8000 ) && - (nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) { + (le16_to_cpu (nic->eeprom[eeprom_cnfg_mdix]) & eeprom_mdix_enabled))) {/* enable/disable MDI/MDI-X auto-switching. */ mdio_write (netdev, nic->mii.phy_id,MII_NCONFIG , nic->mii.force_media ?0 :NCONFIG_AUTO_SWITCH );
@@ -2264,9 +2264,9 @@ static int e100_asf(struct nic *nic) {/* ASF can be enabled from eeprom */ return (nic->pdev->device >=0x1050 ) && (nic->pdev->device <=0x1057 ) && - (nic->eeprom[eeprom_config_asf] & eeprom_asf) && - !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) && - ((nic->eeprom[eeprom_smbus_addr] &0xFF ) !=0xFE ); + (le16_to_cpu (nic->eeprom[eeprom_config_asf]) & eeprom_asf) && + !(le16_to_cpu (nic->eeprom[eeprom_config_asf]) & eeprom_gcl) && + ((le16_to_cpu (nic->eeprom[eeprom_smbus_addr]) &0xFF ) !=0xFE ); }static int e100_up (struct nic *nic)
@@ -2922,7 +2922,7 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/* Wol magic packet can be enabled from eeprom */ if ((nic->mac >= mac_82558_D101_A4) && - (nic->eeprom[eeprom_id] & eeprom_id_wol)) { + (le16_to_cpu (nic->eeprom[eeprom_id]) & eeprom_id_wol)) { nic->flags |= wol_magic;device_set_wakeup_enable (&pdev->dev, true); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 241/421 clk: renesas: r8a77995: Add ZA2 clock
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit 790c06cc5df263cdaff748670cc65958c81b0951 ]
R-Car D3 ZA2 clock is from PLL0D3 or S0,
and it can be controlled by ZA2CKCR.
It is needed for R-Car Sound, but is not used so far. Using default settings is very enough at this point. This patch adds it by DEF_FIXED().
--- drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/renesas/r8a77995-cpg-mssr.c +1 -0
@@ -73,6 +73,7 @@ static const struct cpg_core_clk r8a77995_core_clks[] __initconst = {DEF_FIXED (".sdsrc" ,CLK_SDSRC ,CLK_PLL1 ,2 ,1 ),/* Core Clock Outputs */ +DEF_FIXED ("za2" ,R8A77995_CLK_ZA2 ,CLK_PLL0D3 ,2 ,1 ),DEF_FIXED ("z2" ,R8A77995_CLK_Z2 ,CLK_PLL0D3 ,1 ,1 ),DEF_FIXED ("ztr" ,R8A77995_CLK_ZTR ,CLK_PLL1 ,6 ,1 ), DEF_FIXED("zt", R8A77995_CLK_ZT, CLK_PLL1, 4, 1),
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 242/421 clk: tegra: Ensure that PLLU configuration is applied properly
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit a7196048cd5168096c2c4f44a3939d7a6dcd06b9 ]
The PLLU (USB) consists of the PLL configuration itself and configuration of the PLLU outputs. The PLLU programming is inconsistent on T30 vs T114, where T114 immediately bails out if PLLU is enabled and T30 re-enables a potentially already enabled PLL (left after bootloader) and then fully reprograms it, which could be unsafe to do. The correct way should be to skip enabling of the PLL if it's already enabled and then apply configuration to the outputs. This patch doesn't fix any known problems, it's a minor improvement.
--- drivers/clk/tegra/clk-pll.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clk/tegra/clk-pll.c +4 -2
@@ -1091,7 +1091,8 @@ static int clk_pllu_enable(struct clk_hw *hw)if (pll->lock)spin_lock_irqsave (pll->lock, flags); -_clk_pll_enable (hw); +if (!clk_pll_is_enabled (hw)) +_clk_pll_enable (hw); ret =clk_pll_wait_for_lock (pll);if (ret <0 )
@@ -1708,7 +1709,8 @@ static int clk_pllu_tegra114_enable(struct clk_hw *hw)if (pll->lock)spin_lock_irqsave (pll->lock, flags); -_clk_pll_enable (hw); +if (!clk_pll_is_enabled (hw)) +_clk_pll_enable (hw); ret =clk_pll_wait_for_lock (pll);if (ret <0 )
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 243/421 ipv6: use prandom_u32() for ID generation
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
[ Upstream commit 62f20e068ccc50d6ab66fdb72ba90da2b9418c99 ]
This is a complement to commit aa6dd211e4b1 ("inet: use bigger hash table for IP ID generation"), but focusing on some specific aspects of IPv6.
Contary to IPv4, IPv6 only uses packet IDs with fragments, and with a minimum MTU of 1280, it's much less easy to force a remote peer to produce many fragments to explore its ID sequence. In addition packet IDs are 32-bit in IPv6, which further complicates their analysis. On the other hand, it is often easier to choose among plenty of possible source addresses and partially work around the bigger hash table the commit above permits, which leaves IPv6 partially exposed to some possibilities of remote analysis at the risk of weakening some protocols like DNS if some IDs can be predicted with a good enough probability.
Given the wide range of permitted IDs, the risk of collision is extremely low so there's no need to rely on the positive increment algorithm that is shared with the IPv4 code via ip_idents_reserve(). We have a fast PRNG, so let's simply call prandom_u32() and be done with it.
Performance measurements at 10 Gbps couldn't show any difference with the previous code, even when using a single core, because due to the large fragments, we're limited to only ~930 kpps at 10 Gbps and the cost of the random generation is completely offset by other operations and by the network transfer time. In addition, this change removes the need to update a shared entry in the idents table so it may even end up being slightly faster on large scale systems where this matters.
The risk of at least one collision here is about 1/80 million among 10 IDs, 1/850k among 100 IDs, and still only 1/8.5k among 1000 IDs, which remains very low compared to IPv4 where all IDs are reused every 4 to 80ms on a 10 Gbps flow depending on packet sizes.
--- net/ipv6/output_core.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-)
net/ipv6/output_core.c +5 -23
@@ -14,29 +14,11 @@ static u32 __ipv6_select_ident(struct net *net,const struct in6_addr *dst, const struct in6_addr *src) { -const struct { -struct in6_addr dst; -struct in6_addr src; - }__aligned(SIPHASH_ALIGNMENT) combined = { - .dst = *dst, - .src = *src, - }; -u32 hash, id; - -/* Note the following code is not safe, but this is okay. */ -if (unlikely (siphash_key_is_zero (&net->ipv4.ip_id_key))) -get_random_bytes (&net->ipv4.ip_id_key, -sizeof (net->ipv4.ip_id_key)); - - hash =siphash (&combined,sizeof (combined), &net->ipv4.ip_id_key); - -/* Treat id of 0 as unset and if we get 0 back from ip_idents_reserve, -* set the hight order instead thus minimizing possible future -* collisions. -*/ - id =ip_idents_reserve (hash,1 ); -if (unlikely (!id)) - id =1 <<31 ; + u32 id; + +do { + id =prandom_u32 (); + }while (!id);return id; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 244/421 RDMA/cxgb4: Fix missing error code in create_qp()
In reply to Greg Kroah-HartmanFrom: Jiapeng Chong <[email protected]>
[ Upstream commit aeb27bb76ad8197eb47890b1ff470d5faf8ec9a5 ]
The error code is missing in this code scenario so 0 will be returned. Add the error code '-EINVAL' to the return value 'ret'.
Eliminates the follow smatch warning:
drivers/infiniband/hw/cxgb4/qp.c:298 create_qp() warn: missing error code 'ret'.
--- drivers/infiniband/hw/cxgb4/qp.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/cxgb4/qp.c +1 -0
@@ -295,6 +295,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,if (user && (!wq->sq.bar2_pa || (need_rq && !wq->rq.bar2_pa))) {pr_warn ("%s: sqid %u or rqid %u not in BAR2 range\n" ,pci_name (rdev->lldi.pdev), wq->sq.qid, wq->rq.qid); + ret = -EINVAL ; goto free_dma; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 245/421 dm space maps: dont reset space map allocation cursor when committing
In reply to Greg Kroah-HartmanFrom: Joe Thornber <[email protected]>
[ Upstream commit 5faafc77f7de69147d1e818026b9a0cbf036a7b2 ]
Current commit code resets the place where the search for free blocks will begin back to the start of the metadata device. There are a couple of repercussions to this:
- The first allocation after the commit is likely to take longer than normal as it searches for a free block in an area that is likely to have very few free blocks (if any).
- Any free blocks it finds will have been recently freed. Reusing them means we have fewer old copies of the metadata to aid recovery from hardware error.
Fix these issues by leaving the cursor alone, only resetting when the search hits the end of the metadata device.
--- drivers/md/persistent-data/dm-space-map-disk.c | 9 ++++++++- drivers/md/persistent-data/dm-space-map-metadata.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-)
drivers/md/persistent-data/dm-space-map-disk.c +8 -1
@@ -171,6 +171,14 @@ static int sm_disk_new_block(struct dm_space_map *sm, dm_block_t *b)* Any block we allocate has to be free in both the old and current ll. */ r =sm_ll_find_common_free_block (&smd->old_ll, &smd->ll, smd->begin, smd->ll.nr_blocks, b); +if (r == -ENOSPC ) { +/* +* There's no free block between smd->begin and the end of the metadata device. +* We search before smd->begin in case something has been freed. +*/ + r =sm_ll_find_common_free_block (&smd->old_ll, &smd->ll,0 , smd->begin, b); + } +if (r)return r;
@@ -199,7 +207,6 @@ static int sm_disk_commit(struct dm_space_map *sm)return r;memcpy (&smd->old_ll, &smd->ll,sizeof (smd->old_ll)); - smd->begin =0 ; smd->nr_allocated_this_transaction =0 ; r =sm_disk_get_nr_free (sm, &nr_free);
drivers/md/persistent-data/dm-space-map-metadata.c +8 -1
@@ -452,6 +452,14 @@ static int sm_metadata_new_block_(struct dm_space_map *sm, dm_block_t *b)* Any block we allocate has to be free in both the old and current ll. */ r =sm_ll_find_common_free_block (&smm->old_ll, &smm->ll, smm->begin, smm->ll.nr_blocks, b); +if (r == -ENOSPC ) { +/* +* There's no free block between smm->begin and the end of the metadata device. +* We search before smm->begin in case something has been freed. +*/ + r =sm_ll_find_common_free_block (&smm->old_ll, &smm->ll,0 , smm->begin, b); + } +if (r)return r;
@@ -503,7 +511,6 @@ static int sm_metadata_commit(struct dm_space_map *sm)return r;memcpy (&smm->old_ll, &smm->ll,sizeof (smm->old_ll)); - smm->begin =0 ; smm->allocated_this_transaction =0 ;return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 246/421 pinctrl: mcp23s08: fix race condition in irq handler
In reply to Greg Kroah-HartmanFrom: Radim Pavlik <[email protected]>
[ Upstream commit 897120d41e7afd9da435cb00041a142aeeb53c07 ]
Checking value of MCP_INTF in mcp23s08_irq suggests that the handler may be called even when there is no interrupt pending.
But the actual interrupt could happened between reading MCP_INTF and MCP_GPIO. In this situation we got nothing from MCP_INTF, but the event gets acknowledged on the expander by reading MCP_GPIO. This leads to losing events.
Fix the problem by not reading any register until we see something in MCP_INTF.
The error was reproduced and fix tested on MCP23017.
--- drivers/pinctrl/pinctrl-mcp23s08.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pinctrl/pinctrl-mcp23s08.c +5 -5
@@ -458,6 +458,11 @@ static irqreturn_t mcp23s08_irq(int irq, void *data)if (mcp_read (mcp,MCP_INTF , &intf)) goto unlock; +if (intf ==0 ) { +/* There is no interrupt pending */ +return IRQ_HANDLED ; + } +if (mcp_read (mcp,MCP_INTCAP , &intcap)) goto unlock;
@@ -475,11 +480,6 @@ static irqreturn_t mcp23s08_irq(int irq, void *data) mcp->cached_gpio = gpio;mutex_unlock (&mcp->lock); -if (intf ==0 ) { -/* There is no interrupt pending */ -return IRQ_HANDLED ; - } -dev_dbg (mcp->chip.parent,"intcap 0x%04X intf 0x%04X gpio_orig 0x%04X gpio 0x%04X\n" , intcap, intf, gpio_orig, gpio);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 247/421 ice: set the value of global config lock timeout longer
In reply to Greg Kroah-HartmanFrom: Liwei Song <[email protected]>
[ Upstream commit fb3612840d4f587a0af9511a11d7989d1fa48206 ]
It may need hold Global Config Lock a longer time when download DDP package file, extend the timeout value to 5000ms to ensure that download can be finished before other AQ command got time to run, this will fix the issue below when probe the device, 5000ms is a test value that work with both Backplane and BreakoutCable NVM image:
ice 0000:f4:00.0: VSI 12 failed lan queue config, error ICE_ERR_CFG ice 0000:f4:00.0: Failed to delete VSI 12 in FW - error: ICE_ERR_AQ_TIMEOUT ice 0000:f4:00.0: probe failed due to setup PF switch: -12
ice: probe of 0000:f4:00.0 failed with error -12
--- drivers/net/ethernet/intel/ice/ice_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_type.h +1 -1
@@ -41,7 +41,7 @@ enum ice_aq_res_ids {/* FW update timeout definitions are in milliseconds */ #define ICE_NVM_TIMEOUT 180000#define ICE_CHANGE_LOCK_TIMEOUT 1000 -#define ICE_GLOBAL_CFG_LOCK_TIMEOUT 3000 +#define ICE_GLOBAL_CFG_LOCK_TIMEOUT 5000enum ice_aq_res_access_type {ICE_RES_READ =1 ,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 248/421 virtio_net: Remove BUG() to avoid machine dead
In reply to Greg Kroah-HartmanFrom: Xianting Tian <[email protected]>
[ Upstream commit 85eb1389458d134bdb75dad502cc026c3753a619 ]
We should not directly BUG() when there is hdr error, it is better to output a print when such error happens. Currently, the caller of xmit_skb() already did it.
--- drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/virtio_net.c +1 -1
@@ -1550,7 +1550,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)if (virtio_net_hdr_from_skb (skb, &hdr->hdr,virtio_is_little_endian (vi->vdev), false,0 )) -BUG (); +return -EPROTO ;if (vi->mergeable_rx_bufs) hdr->num_buffers =0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 249/421 net: bcmgenet: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 74325bf0104573c6dfce42837139aeef3f34be76 ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/ethernet/broadcom/genet/bcmmii.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/broadcom/genet/bcmmii.c +4 -0
@@ -428,6 +428,10 @@ static int bcmgenet_mii_register(struct bcmgenet_priv *priv)int id, ret; pres =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!pres) { +dev_err (&pdev->dev,"Invalid resource\n" ); +return -EINVAL ; + }memset (&res,0 ,sizeof (res));memset (&ppd,0 ,sizeof (ppd));
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 250/421 net: mvpp2: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0bb51a3a385790a4be20085494cf78f70dadf646 ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +4 -0
@@ -5157,6 +5157,10 @@ static int mvpp2_probe(struct platform_device *pdev)return PTR_ERR (priv->lms_base); }else { res =platform_get_resource (pdev,IORESOURCE_MEM ,1 ); +if (!res) { +dev_err (&pdev->dev,"Invalid resource\n" ); +return -EINVAL ; + }if (has_acpi_companion (&pdev->dev)) {/* In case the MDIO memory region is declared in * the ACPI, it can already appear as 'in-use'
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 251/421 net: micrel: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 20f1932e2282c58cb5ac59517585206cf5b385ae ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/ethernet/micrel/ks8842.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/micrel/ks8842.c +4 -0
@@ -1150,6 +1150,10 @@ static int ks8842_probe(struct platform_device *pdev)unsigned i; iomem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!iomem) { +dev_err (&pdev->dev,"Invalid resource\n" ); +return -EINVAL ; + }if (!request_mem_region (iomem->start,resource_size (iomem),DRV_NAME )) goto err_mem_region;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 252/421 fjes: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f18c11812c949553d2b2481ecaa274dd51bed1e7 ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- drivers/net/fjes/fjes_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/fjes/fjes_main.c +4 -0
@@ -1277,6 +1277,10 @@ static int fjes_probe(struct platform_device *plat_dev) adapter->interrupt_watch_enable = false; res =platform_get_resource (plat_dev,IORESOURCE_MEM ,0 ); +if (!res) { + err = -EINVAL ; + goto err_free_control_wq; + } hw->hw_res.start = res->start; hw->hw_res.size =resource_size (res); hw->hw_res.irq =platform_get_irq (plat_dev,0 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 253/421 selinux: use __GFP_NOWARN with GFP_NOWAIT in the AVC
In reply to Greg Kroah-HartmanFrom: Minchan Kim <[email protected]>
[ Upstream commit 648f2c6100cfa18e7dfe43bc0b9c3b73560d623c ]
In the field, we have seen lots of allocation failure from the call path below.
06-03 13:29:12.999 1010315 31557 31557 W Binder : 31542_2: page allocation failure: order:0, mode:0x800(GFP_NOWAIT), nodemask=(null),cpuset=background,mems_allowed=0
...
...
06-03 13:29:12.999 1010315 31557 31557 W Call trace:
06-03 13:29:12.999 1010315 31557 31557 W : dump_backtrace.cfi_jt+0x0/0x8 06-03 13:29:12.999 1010315 31557 31557 W : dump_stack+0xc8/0x14c 06-03 13:29:12.999 1010315 31557 31557 W : warn_alloc+0x158/0x1c8 06-03 13:29:12.999 1010315 31557 31557 W : __alloc_pages_slowpath+0x9d8/0xb80 06-03 13:29:12.999 1010315 31557 31557 W : __alloc_pages_nodemask+0x1c4/0x430 06-03 13:29:12.999 1010315 31557 31557 W : allocate_slab+0xb4/0x390 06-03 13:29:12.999 1010315 31557 31557 W : ___slab_alloc+0x12c/0x3a4 06-03 13:29:12.999 1010315 31557 31557 W : kmem_cache_alloc+0x358/0x5e4 06-03 13:29:12.999 1010315 31557 31557 W : avc_alloc_node+0x30/0x184 06-03 13:29:12.999 1010315 31557 31557 W : avc_update_node+0x54/0x4f0 06-03 13:29:12.999 1010315 31557 31557 W : avc_has_extended_perms+0x1a4/0x460 06-03 13:29:12.999 1010315 31557 31557 W : selinux_file_ioctl+0x320/0x3d0 06-03 13:29:12.999 1010315 31557 31557 W : __arm64_sys_ioctl+0xec/0x1fc 06-03 13:29:12.999 1010315 31557 31557 W : el0_svc_common+0xc0/0x24c 06-03 13:29:12.999 1010315 31557 31557 W : el0_svc+0x28/0x88 06-03 13:29:12.999 1010315 31557 31557 W : el0_sync_handler+0x8c/0xf0 06-03 13:29:12.999 1010315 31557 31557 W : el0_sync+0x1a4/0x1c0 .. .. 06-03 13:29:12.999 1010315 31557 31557 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:12.999 1010315 31557 31557 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:12.999 1010315 31557 31557 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:12.999 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:12.999 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:12.999 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:12.999 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:12.999 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:12.999 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:12.999 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:12.999 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:12.999 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:13.000 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:13.000 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 1010161 10686 10686 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 1010161 10686 10686 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:13.000 1010161 10686 10686 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 10230 30892 30892 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 10230 30892 30892 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0 06-03 13:29:13.000 10230 30892 30892 W node 0 : slabs: 57, objs: 2907, free: 0 06-03 13:29:13.000 10230 30892 30892 W SLUB : Unable to allocate memory on node -1, gfp=0x900(GFP_NOWAIT|__GFP_ZERO) 06-03 13:29:13.000 10230 30892 30892 W cache : avc_node, object size: 72, buffer size: 80, default order: 0, min order: 0
Based on [1], selinux is tolerate for failure of memory allocation. Then, use __GFP_NOWARN together.
[1] 476accbe2f6e ("selinux: use GFP_NOWAIT in the AVC kmem_caches")
--- security/selinux/avc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
security/selinux/avc.c +7 -6
@@ -366,26 +366,27 @@ static struct avc_xperms_decision_nodestruct avc_xperms_decision_node *xpd_node;struct extended_perms_decision *xpd; - xpd_node =kmem_cache_zalloc (avc_xperms_decision_cachep,GFP_NOWAIT ); + xpd_node =kmem_cache_zalloc (avc_xperms_decision_cachep, +GFP_NOWAIT | __GFP_NOWARN);if (!xpd_node)return NULL ; xpd = &xpd_node->xpd;if (which &XPERMS_ALLOWED ) { xpd->allowed =kmem_cache_zalloc (avc_xperms_data_cachep, -GFP_NOWAIT ); +GFP_NOWAIT | __GFP_NOWARN);if (!xpd->allowed) goto error; }if (which &XPERMS_AUDITALLOW ) { xpd->auditallow =kmem_cache_zalloc (avc_xperms_data_cachep, -GFP_NOWAIT ); +GFP_NOWAIT | __GFP_NOWARN);if (!xpd->auditallow) goto error; }if (which &XPERMS_DONTAUDIT ) { xpd->dontaudit =kmem_cache_zalloc (avc_xperms_data_cachep, -GFP_NOWAIT ); +GFP_NOWAIT | __GFP_NOWARN);if (!xpd->dontaudit) goto error; }
@@ -413,7 +414,7 @@ static struct avc_xperms_node *avc_xperms_alloc(void) {struct avc_xperms_node *xp_node; - xp_node =kmem_cache_zalloc (avc_xperms_cachep,GFP_NOWAIT ); + xp_node =kmem_cache_zalloc (avc_xperms_cachep,GFP_NOWAIT | __GFP_NOWARN);if (!xp_node)return xp_node;INIT_LIST_HEAD (&xp_node->xpd_head);
@@ -569,7 +570,7 @@ static struct avc_node *avc_alloc_node(struct selinux_avc *avc) {struct avc_node *node; - node =kmem_cache_zalloc (avc_node_cachep,GFP_NOWAIT ); + node =kmem_cache_zalloc (avc_node_cachep,GFP_NOWAIT | __GFP_NOWARN);if (!node) goto out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 254/421 xfrm: Fix error reporting in xfrm_state_construct.
In reply to Greg Kroah-HartmanFrom: Steffen Klassert <[email protected]>
[ Upstream commit 6fd06963fa74197103cdbb4b494763127b3f2f34 ]
When memory allocation for XFRMA_ENCAP or XFRMA_COADDR fails, the error will not be reported because the -ENOMEM assignment to the err variable is overwritten before. Fix this by moving these two in front of the function so that memory allocation failures will be reported.
--- net/xfrm/xfrm_user.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
net/xfrm/xfrm_user.c +14 -14
@@ -579,6 +579,20 @@ static struct xfrm_state *xfrm_state_construct(struct net *net,copy_from_user_state (x, p); +if (attrs[XFRMA_ENCAP ]) { + x->encap =kmemdup (nla_data (attrs[XFRMA_ENCAP ]), +sizeof (*x->encap),GFP_KERNEL ); +if (x->encap ==NULL ) + goto error; + } + +if (attrs[XFRMA_COADDR ]) { + x->coaddr =kmemdup (nla_data (attrs[XFRMA_COADDR ]), +sizeof (*x->coaddr),GFP_KERNEL ); +if (x->coaddr ==NULL ) + goto error; + } +if (attrs[XFRMA_SA_EXTRA_FLAGS ]) x->props.extra_flags =nla_get_u32 (attrs[XFRMA_SA_EXTRA_FLAGS ]);
@@ -599,23 +613,9 @@ static struct xfrm_state *xfrm_state_construct(struct net *net, attrs[XFRMA_ALG_COMP]))) goto error; -if (attrs[XFRMA_ENCAP ]) { - x->encap =kmemdup (nla_data (attrs[XFRMA_ENCAP ]), -sizeof (*x->encap),GFP_KERNEL ); -if (x->encap ==NULL ) - goto error; - } -if (attrs[XFRMA_TFCPAD ]) x->tfcpad =nla_get_u32 (attrs[XFRMA_TFCPAD ]); -if (attrs[XFRMA_COADDR ]) { - x->coaddr =kmemdup (nla_data (attrs[XFRMA_COADDR ]), -sizeof (*x->coaddr),GFP_KERNEL ); -if (x->coaddr ==NULL ) - goto error; - } -xfrm_mark_get (attrs, &x->mark);xfrm_smark_init (attrs, &x->props.smark);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 255/421 wlcore/wl12xx: Fix wl12xx get_mac error if device is in ELP
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 11ef6bc846dcdce838f0b00c5f6a562c57e5d43b ]
At least on wl12xx, reading the MAC after boot can fail with a warning at drivers/net/wireless/ti/wlcore/sdio.c:78 wl12xx_sdio_raw_read. The failed call comes from wl12xx_get_mac() that wlcore_nvs_cb() calls after request_firmware_work_func().
After the error, no wireless interface is created. Reloading the wl12xx module makes the interface work.
Turns out the wlan controller can be in a low-power ELP state after the boot from the bootloader or kexec, and needs to be woken up first.
Let's wake the hardware and add a sleep after that similar to wl12xx_pre_boot() is already doing.
Note that a similar issue could exist for wl18xx, but I have not seen it so far. And a search for wl18xx_get_mac and wl12xx_sdio_raw_read did not produce similar errors.
--- drivers/net/wireless/ti/wl12xx/main.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/ti/wl12xx/main.c +7 -0
@@ -1517,6 +1517,13 @@ static int wl12xx_get_fuse_mac(struct wl1271 *wl)u32 mac1, mac2;int ret; +/* Device may be in ELP from the bootloader or kexec */ + ret =wlcore_write32 (wl,WL12XX_WELP_ARM_COMMAND ,WELP_ARM_COMMAND_VAL ); +if (ret <0 ) + goto out; + +usleep_range (500000 ,700000 ); + ret =wlcore_set_partition (wl, &wl->ptable[PART_DRPW ]);if (ret <0 ) goto out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 256/421 wl1251: Fix possible buffer overflow in wl1251_cmd_scan
In reply to Greg Kroah-HartmanFrom: Lee Gibson <[email protected]>
[ Upstream commit d10a87a3535cce2b890897914f5d0d83df669c63 ]
Function wl1251_cmd_scan calls memcpy without checking the length. Harden by checking the length is within the maximum allowed size.
--- drivers/net/wireless/ti/wl1251/cmd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/ti/wl1251/cmd.c +6 -3
@@ -466,9 +466,12 @@ int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len, cmd->channels[i].channel = channels[i]->hw_value; } - cmd->params.ssid_len = ssid_len; -if (ssid) -memcpy (cmd->params.ssid, ssid, ssid_len); +if (ssid) { +int len =clamp_val (ssid_len,0 ,IEEE80211_MAX_SSID_LEN ); + + cmd->params.ssid_len = len; +memcpy (cmd->params.ssid, ssid, len); + } ret =wl1251_cmd_send (wl,CMD_SCAN , cmd,sizeof (*cmd));if (ret <0 ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 257/421 cw1200: add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit dd778f89225cd258e8f0fed2b7256124982c8bb5 ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/net/wireless/st/cw1200/cw1200_sdio.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/st/cw1200/cw1200_sdio.c +1 -0
@@ -63,6 +63,7 @@ static const struct sdio_device_id cw1200_sdio_ids[] = { { SDIO_DEVICE(SDIO_VENDOR_ID_STE, SDIO_DEVICE_ID_STE_CW1200) }, { /* end: all zeroes */ }, }; +MODULE_DEVICE_TABLE (sdio, cw1200_sdio_ids);/* hwbus_ops implemetation */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 258/421 net: fix mistake path for netdev_features_strings
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 2d8ea148e553e1dd4e80a87741abdfb229e2b323 ]
Th_strings arrays netdev_features_strings, tunable_strings, and phy_tunable_strings has been moved to file net/ethtool/common.c. So fixes the comment.
--- include/linux/netdev_features.h | 2 +- include/uapi/linux/ethtool.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/netdev_features.h +1 -1
@@ -88,7 +88,7 @@ enum {/* * Add your fresh new feature above and remember to update -* netdev_features_strings[] in net/core/ethtool.c and maybe +* netdev_features_strings[] in net/ethtool/common.c and maybe * some feature mask #defines below. Please also describe it * in Documentation/networking/netdev-features.txt. */
include/uapi/linux/ethtool.h +2 -2
@@ -227,7 +227,7 @@ enum tunable_id {ETHTOOL_PFC_PREVENTION_TOUT ,/* timeout in msecs */ /* * Add your fresh new tunable attribute above and remember to update -* tunable_strings[] in net/core/ethtool.c +* tunable_strings[] in net/ethtool/common.c */ __ETHTOOL_TUNABLE_COUNT, };
@@ -261,7 +261,7 @@ enum phy_tunable_id {ETHTOOL_PHY_DOWNSHIFT ,/* * Add your fresh new phy tunable attribute above and remember to update -* phy_tunable_strings[] in net/core/ethtool.c +* phy_tunable_strings[] in net/ethtool/common.c */ __ETHTOOL_PHY_TUNABLE_COUNT, };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 259/421 rtl8xxxu: Fix device info for RTL8192EU devices
In reply to Greg Kroah-HartmanFrom: Pascal Terjan <[email protected]>
[ Upstream commit c240b044edefa3c3af4014a4030e017dd95b59a1 ]
Based on 2001:3319 and 2357:0109 which I used to test the fix and 0bda:818b and 2357:0108 for which I found efuse dumps online.
== 2357:0109 ==
=== Before ===
Vendor: Realtek
Product: \x03802.11n NI
Serial:
=== After ===
Vendor: Realtek
Product: 802.11n NIC
Serial not available.
== 2001:3319 ==
=== Before ===
Vendor: Realtek
Product: Wireless N
Serial: no USB Adap
=== After ===
Vendor: Realtek
Product: Wireless N Nano USB Adapter
Serial not available.
--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 11 +--- .../realtek/rtl8xxxu/rtl8xxxu_8192e.c | 59 +++++++++++++++++-- 2 files changed, 56 insertions(+), 14 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +3 -8
@@ -861,15 +861,10 @@ struct rtl8192eu_efuse {u8 usb_optional_function;u8 res9[2 ];u8 mac_addr[ETH_ALEN ];/* 0xd7 */ -u8 res10[2 ]; -u8 vendor_name[7 ]; -u8 res11[2 ]; -u8 device_name[0x0b ];/* 0xe8 */ -u8 res12[2 ]; -u8 serial[0x0b ];/* 0xf5 */ -u8 res13[0x30 ]; +u8 device_info[80 ]; +u8 res11[3 ];u8 unknown[0x0d ];/* 0x130 */ -u8 res14[0xc3 ]; +u8 res12[0xc3 ]; };struct rtl8xxxu_reg8val {
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +53 -6
74 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 260/421 MIPS: add PMD table accounting into MIPSpmd_alloc_one
In reply to Greg Kroah-HartmanFrom: Huang Pei <[email protected]>
[ Upstream commit ed914d48b6a1040d1039d371b56273d422c0081e ]
This fixes Page Table accounting bug.
MIPS is the ONLY arch just defining __HAVE_ARCH_PMD_ALLOC_ONE alone. Since commit b2b29d6d011944 (mm: account PMD tables like PTE tables), "pmd_free" in asm-generic with PMD table accounting and "pmd_alloc_one" in MIPS without PMD table accounting causes PageTable accounting number negative, which read by global_zone_page_state(), always returns 0.
--- arch/mips/include/asm/pgalloc.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/mips/include/asm/pgalloc.h +7 -3
@@ -93,11 +93,15 @@ do { \static inline pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long address) { -pmd_t *pmd; +pmd_t *pmd =NULL ; +struct page *pg; - pmd = (pmd_t *)__get_free_pages (GFP_KERNEL ,PMD_ORDER ); -if (pmd) + pg =alloc_pages (GFP_KERNEL | __GFP_ACCOUNT,PMD_ORDER ); +if (pg) { +pgtable_pmd_page_ctor (pg); + pmd = (pmd_t *)page_address (pg);pmd_init ((unsigned long )pmd, (unsigned long )invalid_pte_table); + }return pmd; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 261/421 atm: nicstar: use dma_free_coherent instead of kfree
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 6a1e5a4af17e440dd82a58a2c5f40ff17a82b722 ]
When 'nicstar_init_one' fails, 'ns_init_card_error' will be executed for error handling, but the correct memory free function should be used, otherwise it will cause an error. Since 'card->rsq.org' and 'card->tsq.org' are allocated using 'dma_alloc_coherent' function, they should be freed using 'dma_free_coherent'.
Fix this by using 'dma_free_coherent' instead of 'kfree'
This log reveals it:
[ 3.440294] kernel BUG at mm/slub.c:4206! [ 3.441059] invalid opcode: 0000 [#1] PREEMPT SMP PTI [ 3.441430] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.12.4-g70e7f0549188-dirty #141 [ 3.441986] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [ 3.442780] RIP: 0010:kfree+0x26a/0x300 [ 3.443065] Code: e8 3a c3 b9 ff e9 d6 fd ff ff 49 8b 45 00 31 db a9 00 00 01 00 75 4d 49 8b 45 00 a9 00 00 01 00 75 0a 49 8b 45 08 a8 01 75 02 <0f> 0b 89 d9 b8 00 10 00 00 be 06 00 00 00 48 d3 e0 f7 d8 48 63 d0 [ 3.443396] RSP: 0000:ffffc90000017b70 EFLAGS: 00010246 [ 3.443396] RAX: dead000000000100 RBX: 0000000000000000 RCX: 0000000000000000 [ 3.443396] RDX: 0000000000000000 RSI: ffffffff85d3df94 RDI: ffffffff85df38e6 [ 3.443396] RBP: ffffc90000017b90 R08: 0000000000000001 R09: 0000000000000001 [ 3.443396] R10: 0000000000000000 R11: 0000000000000001 R12: ffff888107dc0000 [ 3.443396] R13: ffffea00001f0100 R14: ffff888101a8bf00 R15: ffff888107dc0160 [ 3.443396] FS: 0000000000000000(0000) GS:ffff88817bc80000(0000) knlGS:0000000000000000 [ 3.443396] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3.443396] CR2: 0000000000000000 CR3: 000000000642e000 CR4: 00000000000006e0 [ 3.443396] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3.443396] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3.443396] Call Trace: [ 3.443396] ns_init_card_error+0x12c/0x220 [ 3.443396] nicstar_init_one+0x10d2/0x1130 [ 3.443396] local_pci_probe+0x4a/0xb0 [ 3.443396] pci_device_probe+0x126/0x1d0 [ 3.443396] ? pci_device_remove+0x100/0x100 [ 3.443396] really_probe+0x27e/0x650 [ 3.443396] driver_probe_device+0x84/0x1d0 [ 3.443396] ? mutex_lock_nested+0x16/0x20 [ 3.443396] device_driver_attach+0x63/0x70 [ 3.443396] __driver_attach+0x117/0x1a0 [ 3.443396] ? device_driver_attach+0x70/0x70 [ 3.443396] bus_for_each_dev+0xb6/0x110 [ 3.443396] ? rdinit_setup+0x40/0x40 [ 3.443396] driver_attach+0x22/0x30 [ 3.443396] bus_add_driver+0x1e6/0x2a0 [ 3.443396] driver_register+0xa4/0x180 [ 3.443396] __pci_register_driver+0x77/0x80 [ 3.443396] ? uPD98402_module_init+0xd/0xd [ 3.443396] nicstar_init+0x1f/0x75 [ 3.443396] do_one_initcall+0x7a/0x3d0 [ 3.443396] ? rdinit_setup+0x40/0x40 [ 3.443396] ? rcu_read_lock_sched_held+0x4a/0x70 [ 3.443396] kernel_init_freeable+0x2a7/0x2f9 [ 3.443396] ? rest_init+0x2c0/0x2c0 [ 3.443396] kernel_init+0x13/0x180 [ 3.443396] ? rest_init+0x2c0/0x2c0 [ 3.443396] ? rest_init+0x2c0/0x2c0 [ 3.443396] ret_from_fork+0x1f/0x30 [ 3.443396] Modules linked in: [ 3.443396] Dumping ftrace buffer: [ 3.443396] (ftrace buffer empty) [ 3.458593] ---[ end trace 3c6f8f0d8ef59bcd ]--- [ 3.458922] RIP: 0010:kfree+0x26a/0x300 [ 3.459198] Code: e8 3a c3 b9 ff e9 d6 fd ff ff 49 8b 45 00 31 db a9 00 00 01 00 75 4d 49 8b 45 00 a9 00 00 01 00 75 0a 49 8b 45 08 a8 01 75 02 <0f> 0b 89 d9 b8 00 10 00 00 be 06 00 00 00 48 d3 e0 f7 d8 48 63 d0 [ 3.460499] RSP: 0000:ffffc90000017b70 EFLAGS: 00010246 [ 3.460870] RAX: dead000000000100 RBX: 0000000000000000 RCX: 0000000000000000 [ 3.461371] RDX: 0000000000000000 RSI: ffffffff85d3df94 RDI: ffffffff85df38e6 [ 3.461873] RBP: ffffc90000017b90 R08: 0000000000000001 R09: 0000000000000001 [ 3.462372] R10: 0000000000000000 R11: 0000000000000001 R12: ffff888107dc0000 [ 3.462871] R13: ffffea00001f0100 R14: ffff888101a8bf00 R15: ffff888107dc0160 [ 3.463368] FS: 0000000000000000(0000) GS:ffff88817bc80000(0000) knlGS:0000000000000000 [ 3.463949] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3.464356] CR2: 0000000000000000 CR3: 000000000642e000 CR4: 00000000000006e0 [ 3.464856] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3.465356] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3.465860] Kernel panic - not syncing: Fatal exception [ 3.466370] Dumping ftrace buffer: [ 3.466616] (ftrace buffer empty) [ 3.466871] Kernel Offset: disabled [ 3.467122] Rebooting in 1 seconds..
--- drivers/atm/nicstar.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/atm/nicstar.c +4 -2
@@ -836,10 +836,12 @@ static void ns_init_card_error(ns_dev *card, int error)dev_kfree_skb_any (hb); }if (error >=12 ) { -kfree (card->rsq.org); +dma_free_coherent (&card->pcidev->dev,NS_RSQSIZE +NS_RSQ_ALIGNMENT , + card->rsq.org, card->rsq.dma); }if (error >=11 ) { -kfree (card->tsq.org); +dma_free_coherent (&card->pcidev->dev,NS_TSQSIZE +NS_TSQ_ALIGNMENT , + card->tsq.org, card->tsq.dma); }if (error >=10 ) {free_irq (card->pcidev->irq, card);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 262/421 atm: nicstar: register the interrupt handler in the right place
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 70b639dc41ad499384e41e106fce72e36805c9f2 ]
Because the error handling is sequential, the application of resources should be carried out in the order of error handling, so the operation of registering the interrupt handler should be put in front, so as not to free the unregistered interrupt handler during error handling.
This log reveals it:
[ 3.438724] Trying to free already-free IRQ 23 [ 3.439060] WARNING: CPU: 5 PID: 1 at kernel/irq/manage.c:1825 free_irq+0xfb/0x480 [ 3.440039] Modules linked in: [ 3.440257] CPU: 5 PID: 1 Comm: swapper/0 Not tainted 5.12.4-g70e7f0549188-dirty #142 [ 3.440793] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [ 3.441561] RIP: 0010:free_irq+0xfb/0x480 [ 3.441845] Code: 6e 08 74 6f 4d 89 f4 e8 c3 78 09 00 4d 8b 74 24 18 4d 85 f6 75 e3 e8 b4 78 09 00 8b 75 c8 48 c7 c7 a0 ac d5 85 e8 95 d7 f5 ff <0f> 0b 48 8b 75 c0 4c 89 ff e8 87 c5 90 03 48 8b 43 40 4c 8b a0 80 [ 3.443121] RSP: 0000:ffffc90000017b50 EFLAGS: 00010086 [ 3.443483] RAX: 0000000000000000 RBX: ffff888107c6f000 RCX: 0000000000000000 [ 3.443972] RDX: 0000000000000000 RSI: ffffffff8123f301 RDI: 00000000ffffffff [ 3.444462] RBP: ffffc90000017b90 R08: 0000000000000001 R09: 0000000000000003 [ 3.444950] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000 [ 3.444994] R13: ffff888107dc0000 R14: ffff888104f6bf00 R15: ffff888107c6f0a8 [ 3.444994] FS: 0000000000000000(0000) GS:ffff88817bd40000(0000) knlGS:0000000000000000 [ 3.444994] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3.444994] CR2: 0000000000000000 CR3: 000000000642e000 CR4: 00000000000006e0 [ 3.444994] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3.444994] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3.444994] Call Trace: [ 3.444994] ns_init_card_error+0x18e/0x250 [ 3.444994] nicstar_init_one+0x10d2/0x1130 [ 3.444994] local_pci_probe+0x4a/0xb0 [ 3.444994] pci_device_probe+0x126/0x1d0 [ 3.444994] ? pci_device_remove+0x100/0x100 [ 3.444994] really_probe+0x27e/0x650 [ 3.444994] driver_probe_device+0x84/0x1d0 [ 3.444994] ? mutex_lock_nested+0x16/0x20 [ 3.444994] device_driver_attach+0x63/0x70 [ 3.444994] __driver_attach+0x117/0x1a0 [ 3.444994] ? device_driver_attach+0x70/0x70 [ 3.444994] bus_for_each_dev+0xb6/0x110 [ 3.444994] ? rdinit_setup+0x40/0x40 [ 3.444994] driver_attach+0x22/0x30 [ 3.444994] bus_add_driver+0x1e6/0x2a0 [ 3.444994] driver_register+0xa4/0x180 [ 3.444994] __pci_register_driver+0x77/0x80 [ 3.444994] ? uPD98402_module_init+0xd/0xd [ 3.444994] nicstar_init+0x1f/0x75 [ 3.444994] do_one_initcall+0x7a/0x3d0 [ 3.444994] ? rdinit_setup+0x40/0x40 [ 3.444994] ? rcu_read_lock_sched_held+0x4a/0x70 [ 3.444994] kernel_init_freeable+0x2a7/0x2f9 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] kernel_init+0x13/0x180 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] ret_from_fork+0x1f/0x30 [ 3.444994] Kernel panic - not syncing: panic_on_warn set ... [ 3.444994] CPU: 5 PID: 1 Comm: swapper/0 Not tainted 5.12.4-g70e7f0549188-dirty #142 [ 3.444994] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [ 3.444994] Call Trace: [ 3.444994] dump_stack+0xba/0xf5 [ 3.444994] ? free_irq+0xfb/0x480 [ 3.444994] panic+0x155/0x3ed [ 3.444994] ? __warn+0xed/0x150 [ 3.444994] ? free_irq+0xfb/0x480 [ 3.444994] __warn+0x103/0x150 [ 3.444994] ? free_irq+0xfb/0x480 [ 3.444994] report_bug+0x119/0x1c0 [ 3.444994] handle_bug+0x3b/0x80 [ 3.444994] exc_invalid_op+0x18/0x70 [ 3.444994] asm_exc_invalid_op+0x12/0x20 [ 3.444994] RIP: 0010:free_irq+0xfb/0x480 [ 3.444994] Code: 6e 08 74 6f 4d 89 f4 e8 c3 78 09 00 4d 8b 74 24 18 4d 85 f6 75 e3 e8 b4 78 09 00 8b 75 c8 48 c7 c7 a0 ac d5 85 e8 95 d7 f5 ff <0f> 0b 48 8b 75 c0 4c 89 ff e8 87 c5 90 03 48 8b 43 40 4c 8b a0 80 [ 3.444994] RSP: 0000:ffffc90000017b50 EFLAGS: 00010086 [ 3.444994] RAX: 0000000000000000 RBX: ffff888107c6f000 RCX: 0000000000000000 [ 3.444994] RDX: 0000000000000000 RSI: ffffffff8123f301 RDI: 00000000ffffffff [ 3.444994] RBP: ffffc90000017b90 R08: 0000000000000001 R09: 0000000000000003 [ 3.444994] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000 [ 3.444994] R13: ffff888107dc0000 R14: ffff888104f6bf00 R15: ffff888107c6f0a8 [ 3.444994] ? vprintk_func+0x71/0x110 [ 3.444994] ns_init_card_error+0x18e/0x250 [ 3.444994] nicstar_init_one+0x10d2/0x1130 [ 3.444994] local_pci_probe+0x4a/0xb0 [ 3.444994] pci_device_probe+0x126/0x1d0 [ 3.444994] ? pci_device_remove+0x100/0x100 [ 3.444994] really_probe+0x27e/0x650 [ 3.444994] driver_probe_device+0x84/0x1d0 [ 3.444994] ? mutex_lock_nested+0x16/0x20 [ 3.444994] device_driver_attach+0x63/0x70 [ 3.444994] __driver_attach+0x117/0x1a0 [ 3.444994] ? device_driver_attach+0x70/0x70 [ 3.444994] bus_for_each_dev+0xb6/0x110 [ 3.444994] ? rdinit_setup+0x40/0x40 [ 3.444994] driver_attach+0x22/0x30 [ 3.444994] bus_add_driver+0x1e6/0x2a0 [ 3.444994] driver_register+0xa4/0x180 [ 3.444994] __pci_register_driver+0x77/0x80 [ 3.444994] ? uPD98402_module_init+0xd/0xd [ 3.444994] nicstar_init+0x1f/0x75 [ 3.444994] do_one_initcall+0x7a/0x3d0 [ 3.444994] ? rdinit_setup+0x40/0x40 [ 3.444994] ? rcu_read_lock_sched_held+0x4a/0x70 [ 3.444994] kernel_init_freeable+0x2a7/0x2f9 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] kernel_init+0x13/0x180 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] ? rest_init+0x2c0/0x2c0 [ 3.444994] ret_from_fork+0x1f/0x30 [ 3.444994] Dumping ftrace buffer: [ 3.444994] (ftrace buffer empty) [ 3.444994] Kernel Offset: disabled [ 3.444994] Rebooting in 1 seconds..
--- drivers/atm/nicstar.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/atm/nicstar.c +9 -9
@@ -524,6 +524,15 @@ static int ns_init_card(int i, struct pci_dev *pcidev)/* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */ writel (0x00000000 , card->membase +VPM ); + card->intcnt =0 ; +if (request_irq + (pcidev->irq, &ns_irq_handler,IRQF_SHARED ,"nicstar" , card) !=0 ) { +pr_err ("nicstar%d: can't allocate IRQ %d.\n" , i, pcidev->irq); + error =9 ; +ns_init_card_error (card, error); +return error; + } +/* Initialize TSQ */ card->tsq.org = dma_alloc_coherent(&card->pcidev->dev, NS_TSQSIZE + NS_TSQ_ALIGNMENT,
@@ -750,15 +759,6 @@ static int ns_init_card(int i, struct pci_dev *pcidev) card->efbie =1 ; - card->intcnt =0 ; -if (request_irq - (pcidev->irq, &ns_irq_handler,IRQF_SHARED ,"nicstar" , card) !=0 ) { -printk ("nicstar%d: can't allocate IRQ %d.\n" , i, pcidev->irq); - error =9 ; -ns_init_card_error (card, error); -return error; - } -/* Register device */ card->atmdev =atm_dev_register ("nicstar" , &card->pcidev->dev, &atm_ops,-1 ,NULL );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 263/421 vsock: notify server to shutdown when client has pending signal
In reply to Greg Kroah-HartmanFrom: Longpeng(Mike) <[email protected]>
[ Upstream commit c7ff9cff70601ea19245d997bb977344663434c7 ]
The client's sk_state will be set to TCP_ESTABLISHED if the server replay the client's connect request.
However, if the client has pending signal, its sk_state will be set to TCP_CLOSE without notify the server, so the server will hold the corrupt connection.
client server
1. sk_state=TCP_SYN_SENT |
2. call ->connect() |
3. wait reply |
| 4. sk_state=TCP_ESTABLISHED
| 5. insert to connected list
| 6. reply to the client
7. sk_state=TCP_ESTABLISHED |
8. insert to connected list |
9. *signal pending* <--------------------- the user kill client
10. sk_state=TCP_CLOSE |
client is exiting... |
11. call ->release() |
virtio_transport_close
if (!(sk->sk_state == TCP_ESTABLISHED ||
sk->sk_state == TCP_CLOSING))
return true; *return at here, the server cannot notice the connection is corrupt*So the client should notify the peer in this case.
--- net/vmw_vsock/af_vsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/vmw_vsock/af_vsock.c +1 -1
@@ -1225,7 +1225,7 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr,if (signal_pending (current)) { err =sock_intr_errno (timeout); - sk->sk_state =TCP_CLOSE ; + sk->sk_state = sk->sk_state ==TCP_ESTABLISHED ?TCP_CLOSING :TCP_CLOSE ; sock->state =SS_UNCONNECTED ;vsock_transport_cancel_pkt (vsk); goto out_wait;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 264/421 RDMA/rxe: Dont overwrite errno from ib_umem_get()
In reply to Greg Kroah-HartmanFrom: Xiao Yang <[email protected]>
[ Upstream commit 20ec0a6d6016aa28b9b3299be18baef1a0f91cd2 ]
rxe_mr_init_user() always returns the fixed -EINVAL when ib_umem_get() fails so it's hard for user to know which actual error happens in ib_umem_get(). For example, ib_umem_get() will return -EOPNOTSUPP when trying to pin pages on a DAX file.
Return actual error as mlx4/mlx5 does.
--- drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
@@ -175,7 +175,7 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start,if (IS_ERR (umem)) {pr_warn ("err %d from rxe_umem_get\n" , (int )PTR_ERR (umem)); - err = -EINVAL ; + err =PTR_ERR (umem); goto err1; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 265/421 iwlwifi: mvm: dont change band on bound PHY contexts
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 8835a64f74c46baebfc946cd5a2c861b866ebcee ]
When we have a P2P Device active, we attempt to only change the PHY context it uses when we get a new remain-on-channel, if the P2P Device is the only user of the PHY context.
This is fine if we're switching within a band, but if we're switching bands then the switch implies a removal and re-add of the PHY context, which isn't permitted by the firmware while it's bound to an interface.
Fix the code to skip the unbind/release/... cycle only if the band doesn't change (or we have old devices that can switch the band on the fly as well.)
--- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +18 -6
@@ -3496,6 +3496,7 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif);struct cfg80211_chan_def chandef;struct iwl_mvm_phy_ctxt *phy_ctxt; +bool band_change_removal;int ret, i; IWL_DEBUG_MAC80211(mvm, "enter (%d, %d, %d)\n", channel->hw_value,
@@ -3565,19 +3566,30 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,cfg80211_chandef_create (&chandef, channel,NL80211_CHAN_NO_HT );/* -* Change the PHY context configuration as it is currently referenced -* only by the P2P Device MAC +* Check if the remain-on-channel is on a different band and that +* requires context removal, see iwl_mvm_phy_ctxt_changed(). If +* so, we'll need to release and then re-configure here, since we +* must not remove a PHY context that's part of a binding. */ -if (mvmvif->phy_ctxt->ref ==1 ) { + band_change_removal = +fw_has_capa (&mvm->fw->ucode_capa, +IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT ) && + mvmvif->phy_ctxt->channel->band != chandef.chan->band; + +if (mvmvif->phy_ctxt->ref ==1 && !band_change_removal) { +/* +* Change the PHY context configuration as it is currently +* referenced only by the P2P Device MAC (and we can modify it) +*/ ret =iwl_mvm_phy_ctxt_changed (mvm, mvmvif->phy_ctxt, &chandef,1 ,1 );if (ret) goto out_unlock; }else {/* -* The PHY context is shared with other MACs. Need to remove the -* P2P Device from the binding, allocate an new PHY context and -* create a new binding +* The PHY context is shared with other MACs (or we're trying to +* switch bands), so remove the P2P Device from the binding, +* allocate an new PHY context and create a new binding. */ phy_ctxt =iwl_mvm_get_free_phy_ctxt (mvm);if (!phy_ctxt) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 266/421 iwlwifi: pcie: free IML DMA memory allocation
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 310f60f53a86eba680d9bc20a371e13b06a5f903 ]
In the case of gen3 devices with image loader (IML) support, we were leaking the IML DMA allocation and never freeing it. Fix that.
--- .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 15 ++++++++++----- .../net/wireless/intel/iwlwifi/pcie/internal.h | 3 +++ 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c +10 -5
@@ -63,7 +63,6 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,struct iwl_prph_scratch *prph_scratch;struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl;struct iwl_prph_info *prph_info; -void *iml_img;u32 control_flags =0 ;int ret;
@@ -157,14 +156,15 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, trans_pcie->prph_scratch = prph_scratch;/* Allocate IML */ - iml_img =dma_alloc_coherent (trans->dev, trans->iml_len, - &trans_pcie->iml_dma_addr,GFP_KERNEL ); -if (!iml_img) { + trans_pcie->iml =dma_alloc_coherent (trans->dev, trans->iml_len, + &trans_pcie->iml_dma_addr, +GFP_KERNEL ); +if (!trans_pcie->iml) { ret = -ENOMEM ; goto err_free_ctxt_info; } -memcpy (iml_img, trans->iml, trans->iml_len); +memcpy (trans_pcie->iml, trans->iml, trans->iml_len);iwl_enable_fw_load_int_ctx_info (trans);
@@ -212,6 +212,11 @@ void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans) trans_pcie->ctxt_info_dma_addr =0 ; trans_pcie->ctxt_info_gen3 =NULL ; +dma_free_coherent (trans->dev, trans->iml_len, trans_pcie->iml, + trans_pcie->iml_dma_addr); + trans_pcie->iml_dma_addr =0 ; + trans_pcie->iml =NULL ; +iwl_pcie_ctxt_info_free_fw_img (trans); dma_free_coherent(trans->dev, sizeof(*trans_pcie->prph_scratch),
drivers/net/wireless/intel/iwlwifi/pcie/internal.h +3 -0
@@ -447,6 +447,8 @@ struct iwl_self_init_dram {* Context information addresses will be taken from here. * This is driver's local copy for keeping track of size and * count for allocating and freeing the memory. +* @iml: image loader image virtual address +* @iml_dma_addr: image loader image DMA address * @trans: pointer to the generic transport area * @scd_base_addr: scheduler sram base address in SRAM * @scd_bc_tbls: pointer to the byte count table of the scheduler
@@ -492,6 +494,7 @@ struct iwl_trans_pcie { };struct iwl_prph_info *prph_info;struct iwl_prph_scratch *prph_scratch; +void *iml;dma_addr_t ctxt_info_dma_addr;dma_addr_t prph_info_dma_addr;dma_addr_t prph_scratch_dma_addr;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 267/421 sfc: avoid double pci_remove of VFs
In reply to Greg Kroah-HartmanFrom: Íñigo Huguet <[email protected]>
[ Upstream commit 45423cff1db66cf0993e8a9bd0ac93e740149e49 ]
If pci_remove was called for a PF with VFs, the removal of the VFs was called twice from efx_ef10_sriov_fini: one directly with pci_driver->remove and another implicit by calling pci_disable_sriov, which also perform the VFs remove. This was leading to crashing the kernel on the second attempt.
Given that pci_disable_sriov already calls to pci remove function, get rid of the direct call to pci_driver->remove from the driver.
2 different ways to trigger the bug:
- Create one or more VFs, then attach the PF to a virtual machine (at least with qemu/KVM)
- Create one or more VFs, then remove the PF with:
echo 1 > /sys/bus/pci/devices/PF_PCI_ID/remove
Removing sfc module does not trigger the error, at least for me, because it removes the VF first, and then the PF.
Example of a log with the error:
list_del corruption, ffff967fd20a8ad0->next is LIST_POISON1 (dead000000000100)
------------[ cut here ]------------
kernel BUG at lib/list_debug.c:47!
[...trimmed...]
RIP: 0010:__list_del_entry_valid.cold.1+0x12/0x4c
[...trimmed...]
Call Trace:
efx_dissociate+0x1f/0x140 [sfc]
efx_pci_remove+0x27/0x150 [sfc]
pci_device_remove+0x3b/0xc0
device_release_driver_internal+0x103/0x1f0
pci_stop_bus_device+0x69/0x90
pci_stop_and_remove_bus_device+0xe/0x20
pci_iov_remove_virtfn+0xba/0x120
sriov_disable+0x2f/0xe0
efx_ef10_pci_sriov_disable+0x52/0x80 [sfc]
? pcie_aer_is_native+0x12/0x40
efx_ef10_sriov_fini+0x72/0x110 [sfc]
efx_pci_remove+0x62/0x150 [sfc]
pci_device_remove+0x3b/0xc0
device_release_driver_internal+0x103/0x1f0
unbind_store+0xf6/0x130
kernfs_fop_write+0x116/0x190
vfs_write+0xa5/0x1a0
ksys_write+0x4f/0xb0
do_syscall_64+0x5b/0x1a0
entry_SYSCALL_64_after_hwframe+0x65/0xca--- drivers/net/ethernet/sfc/ef10_sriov.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/net/ethernet/sfc/ef10_sriov.c +1 -9
@@ -443,7 +443,6 @@ int efx_ef10_sriov_init(struct efx_nic *efx)void efx_ef10_sriov_fini (struct efx_nic *efx) {struct efx_ef10_nic_data *nic_data = efx->nic_data; -unsigned int i;int rc;if (!nic_data->vf) {
@@ -453,14 +452,7 @@ void efx_ef10_sriov_fini(struct efx_nic *efx)return ; } -/* Remove any VFs in the host */ -for (i =0 ; i < efx->vf_count; ++i) { -struct efx_nic *vf_efx = nic_data->vf[i].efx; - -if (vf_efx) - vf_efx->pci_dev->driver->remove (vf_efx->pci_dev); - } - +/* Disable SRIOV and remove any VFs in the host */ rc =efx_ef10_pci_sriov_disable (efx, true);if (rc) netif_dbg(efx, drv, efx->net_dev,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 268/421 sfc: error code if SRIOV cannot be disabled
In reply to Greg Kroah-HartmanFrom: Íñigo Huguet <[email protected]>
[ Upstream commit 1ebe4feb8b442884f5a28d2437040096723dd1ea ]
If SRIOV cannot be disabled during device removal or module unloading, return error code so it can be logged properly in the calling function.
Note that this can only happen if any VF is currently attached to a guest using Xen, but not with vfio/KVM. Despite that in that case the VFs won't work properly with PF removed and/or the module unloaded, I have let it as is because I don't know what side effects may have changing it, and also it seems to be the same that other drivers are doing in this situation.
In the case of being called during SRIOV reconfiguration, the behavior hasn't changed because the function is called with force=false.
--- drivers/net/ethernet/sfc/ef10_sriov.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/ethernet/sfc/ef10_sriov.c +11 -4
@@ -406,12 +406,17 @@ fail1:return rc; } +/* Disable SRIOV and remove VFs +* If some VFs are attached to a guest (using Xen, only) nothing is +* done if force=false, and vports are freed if force=true (for the non +* attachedc ones, only) but SRIOV is not disabled and VFs are not +* removed in either case. +*/ static int efx_ef10_pci_sriov_disable (struct efx_nic *efx,bool force) {struct pci_dev *dev = efx->pci_dev; -unsigned int vfs_assigned =0 ; - - vfs_assigned =pci_vfs_assigned (dev); +unsigned int vfs_assigned =pci_vfs_assigned (dev); +int rc =0 ;if (vfs_assigned && !force) { netif_info(efx, drv, efx->net_dev, "VFs are assigned to guests; "
@@ -421,10 +426,12 @@ static int efx_ef10_pci_sriov_disable(struct efx_nic *efx, bool force)if (!vfs_assigned)pci_disable_sriov (dev); +else + rc = -EBUSY ;efx_ef10_sriov_free_vf_vswitching (efx); efx->vf_count =0 ; -return 0 ; +return rc; }int efx_ef10_sriov_configure (struct efx_nic *efx,int num_vfs)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 269/421 wireless: wext-spy: Fix out-of-bounds warning
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit e93bdd78406da9ed01554c51e38b2a02c8ef8025 ]
Fix the following out-of-bounds warning:
net/wireless/wext-spy.c:178:2: warning: 'memcpy' offset [25, 28] from the object at 'threshold' is out of the bounds of referenced subobject 'low' with type 'struct iw_quality' at offset 20 [-Warray-bounds]
The problem is that the original code is trying to copy data into a couple of struct members adjacent to each other in a single call to memcpy(). This causes a legitimate compiler warning because memcpy() overruns the length of &threshold.low and &spydata->spy_thr_low. As these are just a couple of struct members, fix this by using direct assignments, instead of memcpy().
This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy().
--- net/wireless/wext-spy.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/wireless/wext-spy.c +7 -7
@@ -120,8 +120,8 @@ int iw_handler_set_thrspy(struct net_device * dev,return -EOPNOTSUPP ;/* Just do it */ -memcpy (&(spydata->spy_thr_low), &(threshold->low), -2 *sizeof (struct iw_quality )); + spydata->spy_thr_low = threshold->low; + spydata->spy_thr_high = threshold->high;/* Clear flag */ memset (spydata->spy_thr_under,'\0' ,sizeof (spydata->spy_thr_under));
@@ -147,8 +147,8 @@ int iw_handler_get_thrspy(struct net_device * dev,return -EOPNOTSUPP ;/* Just do it */ -memcpy (&(threshold->low), &(spydata->spy_thr_low), -2 *sizeof (struct iw_quality )); + threshold->low = spydata->spy_thr_low; + threshold->high = spydata->spy_thr_high;return 0 ; }
@@ -173,10 +173,10 @@ static void iw_send_thrspy_event(struct net_device * dev,memcpy (threshold.addr.sa_data, address,ETH_ALEN ); threshold.addr.sa_family =ARPHRD_ETHER ;/* Copy stats */ -memcpy (&(threshold.qual), wstats,sizeof (struct iw_quality )); + threshold.qual = *wstats;/* Copy also thresholds */ -memcpy (&(threshold.low), &(spydata->spy_thr_low), -2 *sizeof (struct iw_quality )); + threshold.low = spydata->spy_thr_low; + threshold.high = spydata->spy_thr_high;/* Send event to user space */ wireless_send_event (dev,SIOCGIWTHRSPY , &wrqu, (char *) &threshold);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 270/421 media, bpf: Do not copy more entries than user space requested
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
[ Upstream commit 647d446d66e493d23ca1047fa8492b0269674530 ]
The syscall bpf(BPF_PROG_QUERY, &attr) should use the prog_cnt field to see how many entries user space provided and return ENOSPC if there are more programs than that. Before this patch, this is not checked and ENOSPC is never returned.
Note that one lirc device is limited to 64 bpf programs, and user space I'm aware of -- ir-keytable -- always gives enough space for 64 entries already. However, we should not copy program ids than are requested.
--- drivers/media/rc/bpf-lirc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/rc/bpf-lirc.c +2 -1
@@ -295,7 +295,8 @@ int lirc_prog_query(const union bpf_attr *attr, union bpf_attr __user *uattr) }if (attr->query.prog_cnt !=0 && prog_ids && cnt) - ret =bpf_prog_array_copy_to_user (progs, prog_ids, cnt); + ret =bpf_prog_array_copy_to_user (progs, prog_ids, + attr->query.prog_cnt); unlock:mutex_unlock (&ir_raw_handler_lock);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 271/421 net: ip: avoid OOM kills with large UDP sends over loopback
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 6d123b81ac615072a8525c13c6c41b695270a15d ]
Dave observed number of machines hitting OOM on the UDP send path. The workload seems to be sending large UDP packets over loopback. Since loopback has MTU of 64k kernel will try to allocate an skb with up to 64k of head space. This has a good chance of failing under memory pressure. What's worse if the message length is <32k the allocation may trigger an OOM killer.
This is entirely avoidable, we can use an skb with page frags.
af_unix solves a similar problem by limiting the head length to SKB_MAX_ALLOC. This seems like a good and simple approach. It means that UDP messages > 16kB will now use fragments if underlying device supports SG, if extra allocator pressure causes regressions in real workloads we can switch to trying the large allocation first and falling back.
v4: pre-calculate all the additions to alloclen so
we can be sure it won't go over order-2
--- net/ipv4/ip_output.c | 32 ++++++++++++++++++-------------- net/ipv6/ip6_output.c | 32 +++++++++++++++++--------------- 2 files changed, 35 insertions(+), 29 deletions(-)
net/ipv4/ip_output.c +18 -14
@@ -940,7 +940,7 @@ static int __ip_append_data(struct sock *sk,unsigned int datalen;unsigned int fraglen;unsigned int fraggap; -unsigned int alloclen; +unsigned int alloclen, alloc_extra;unsigned int pagedlen;struct sk_buff *skb_prev; alloc_new_skb:
@@ -960,35 +960,39 @@ alloc_new_skb: fraglen = datalen + fragheaderlen; pagedlen =0 ; + alloc_extra = hh_len +15 ; + alloc_extra += exthdrlen; + +/* The last fragment gets additional space at tail. +* Note, with MSG_MORE we overallocate on fragments, +* because we have no idea what fragment will be +* the last. +*/ +if (datalen == length + fraggap) + alloc_extra += rt->dst.trailer_len; +if ((flags &MSG_MORE ) && !(rt->dst.dev->features&NETIF_F_SG )) alloclen = mtu; -else if (!paged) +else if (!paged && + (fraglen + alloc_extra <SKB_MAX_ALLOC || + !(rt->dst.dev->features &NETIF_F_SG ))) alloclen = fraglen;else { alloclen =min_t (int, fraglen,MAX_HEADER ); pagedlen = fraglen - alloclen; } - alloclen += exthdrlen; - -/* The last fragment gets additional space at tail. -* Note, with MSG_MORE we overallocate on fragments, -* because we have no idea what fragment will be -* the last. -*/ -if (datalen == length + fraggap) - alloclen += rt->dst.trailer_len; + alloclen += alloc_extra;if (transhdrlen) { - skb =sock_alloc_send_skb (sk, - alloclen + hh_len +15 , + skb =sock_alloc_send_skb (sk, alloclen, (flags &MSG_DONTWAIT ), &err); }else { skb =NULL ;if (refcount_read (&sk->sk_wmem_alloc) + wmem_alloc_delta <=2 * sk->sk_sndbuf) - skb =alloc_skb (alloclen + hh_len +15 , + skb =alloc_skb (alloclen, sk->sk_allocation);if (unlikely (!skb)) err = -ENOBUFS ;
net/ipv6/ip6_output.c +17 -15
@@ -1394,7 +1394,7 @@ emsgsize:unsigned int datalen;unsigned int fraglen;unsigned int fraggap; -unsigned int alloclen; +unsigned int alloclen, alloc_extra;unsigned int pagedlen; alloc_new_skb:/* There's no room in the current skb */
@@ -1421,17 +1421,28 @@ alloc_new_skb: fraglen = datalen + fragheaderlen; pagedlen =0 ; + alloc_extra = hh_len; + alloc_extra += dst_exthdrlen; + alloc_extra += rt->dst.trailer_len; + +/* We just reserve space for fragment header. +* Note: this may be overallocation if the message +* (without MSG_MORE) fits into the MTU. +*/ + alloc_extra +=sizeof (struct frag_hdr ); +if ((flags &MSG_MORE ) && !(rt->dst.dev->features&NETIF_F_SG )) alloclen = mtu; -else if (!paged) +else if (!paged && + (fraglen + alloc_extra <SKB_MAX_ALLOC || + !(rt->dst.dev->features &NETIF_F_SG ))) alloclen = fraglen;else { alloclen =min_t (int, fraglen,MAX_HEADER ); pagedlen = fraglen - alloclen; } - - alloclen += dst_exthdrlen; + alloclen += alloc_extra;if (datalen != length + fraggap) {/*
@@ -1441,30 +1452,21 @@ alloc_new_skb: datalen += rt->dst.trailer_len; } - alloclen += rt->dst.trailer_len; fraglen = datalen + fragheaderlen; -/* -* We just reserve space for fragment header. -* Note: this may be overallocation if the message -* (without MSG_MORE) fits into the MTU. -*/ - alloclen +=sizeof (struct frag_hdr ); - copy = datalen - transhdrlen - fraggap - pagedlen;if (copy <0 ) { err = -EINVAL ; goto error; }if (transhdrlen) { - skb =sock_alloc_send_skb (sk, - alloclen + hh_len, + skb =sock_alloc_send_skb (sk, alloclen, (flags &MSG_DONTWAIT ), &err); }else { skb =NULL ;if (refcount_read (&sk->sk_wmem_alloc) + wmem_alloc_delta <=2 * sk->sk_sndbuf) - skb =alloc_skb (alloclen + hh_len, + skb =alloc_skb (alloclen, sk->sk_allocation);if (unlikely (!skb)) err = -ENOBUFS ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 272/421 RDMA/cma: Fix rdma_resolve_route() memory leak
In reply to Greg Kroah-HartmanFrom: Gerd Rausch <[email protected]>
[ Upstream commit 74f160ead74bfe5f2b38afb4fcf86189f9ff40c9 ]
Fix a memory leak when "mda_resolve_route() is called more than once on the same "rdma_cm_id".
This is possible if cma_query_handler() triggers the RDMA_CM_EVENT_ROUTE_ERROR flow which puts the state machine back and allows rdma_resolve_route() to be called again.
--- drivers/infiniband/core/cma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/core/cma.c +2 -1
@@ -2558,7 +2558,8 @@ static int cma_resolve_ib_route(struct rdma_id_private *id_priv, int timeout_ms)cma_init_resolve_route_work (work, id_priv); - route->path_rec =kmalloc (sizeof *route->path_rec,GFP_KERNEL ); +if (!route->path_rec) + route->path_rec =kmalloc (sizeof *route->path_rec,GFP_KERNEL );if (!route->path_rec) { ret = -ENOMEM ; goto err1;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 273/421 Bluetooth: Fix the HCI to MGMT status conversion table
In reply to Greg Kroah-HartmanFrom: Yu Liu <[email protected]>
[ Upstream commit 4ef36a52b0e47c80bbfd69c0cce61c7ae9f541ed ]
0x2B, 0x31 and 0x33 are reserved for future use but were not present in the HCI to MGMT conversion table, this caused the conversion to be incorrect for the HCI status code greater than 0x2A.
--- net/bluetooth/mgmt.c | 3 +++ 1 file changed, 3 insertions(+)
net/bluetooth/mgmt.c +3 -0
@@ -219,12 +219,15 @@ static u8 mgmt_status_table[] = {MGMT_STATUS_TIMEOUT ,/* Instant Passed */ MGMT_STATUS_NOT_SUPPORTED ,/* Pairing Not Supported */ MGMT_STATUS_FAILED ,/* Transaction Collision */ +MGMT_STATUS_FAILED ,/* Reserved for future use */ MGMT_STATUS_INVALID_PARAMS ,/* Unacceptable Parameter */ MGMT_STATUS_REJECTED ,/* QoS Rejected */ MGMT_STATUS_NOT_SUPPORTED ,/* Classification Not Supported */ MGMT_STATUS_REJECTED ,/* Insufficient Security */ MGMT_STATUS_INVALID_PARAMS ,/* Parameter Out Of Range */ +MGMT_STATUS_FAILED ,/* Reserved for future use */ MGMT_STATUS_BUSY ,/* Role Switch Pending */ +MGMT_STATUS_FAILED ,/* Reserved for future use */ MGMT_STATUS_FAILED ,/* Slot Violation */ MGMT_STATUS_FAILED ,/* Role Switch Failed */ MGMT_STATUS_INVALID_PARAMS, /* EIR Too Large */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 274/421 Bluetooth: Shutdown controller after workqueues are flushed or cancelled
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 0ea9fd001a14ebc294f112b0361a4e601551d508 ]
Rfkill block and unblock Intel USB Bluetooth [8087:0026] may make it stops working:
[ 509.691509] Bluetooth: hci0: HCI reset during shutdown failed [ 514.897584] Bluetooth: hci0: MSFT filter_enable is already on [ 530.044751] usb 3-10: reset full-speed USB device number 5 using xhci_hcd [ 545.660350] usb 3-10: device descriptor read/64, error -110 [ 561.283530] usb 3-10: device descriptor read/64, error -110 [ 561.519682] usb 3-10: reset full-speed USB device number 5 using xhci_hcd [ 566.686650] Bluetooth: hci0: unexpected event for opcode 0x0500 [ 568.752452] Bluetooth: hci0: urb 0000000096cd309b failed to resubmit (113) [ 578.797955] Bluetooth: hci0: Failed to read MSFT supported features (-110) [ 586.286565] Bluetooth: hci0: urb 00000000c522f633 failed to resubmit (113) [ 596.215302] Bluetooth: hci0: Failed to read MSFT supported features (-110)
Or kernel panics because other workqueues already freed skb:
[ 2048.663763] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 2048.663775] #PF: supervisor read access in kernel mode [ 2048.663779] #PF: error_code(0x0000) - not-present page [ 2048.663782] PGD 0 P4D 0 [ 2048.663787] Oops: 0000 [#1] SMP NOPTI [ 2048.663793] CPU: 3 PID: 4491 Comm: rfkill Tainted: G W 5.13.0-rc1-next-20210510+ #20 [ 2048.663799] Hardware name: HP HP EliteBook 850 G8 Notebook PC/8846, BIOS T76 Ver. 01.01.04 12/02/2020 [ 2048.663801] RIP: 0010:__skb_ext_put+0x6/0x50 [ 2048.663814] Code: 8b 1b 48 85 db 75 db 5b 41 5c 5d c3 be 01 00 00 00 e8 de 13 c0 ff eb e7 be 02 00 00 00 e8 d2 13 c0 ff eb db 0f 1f 44 00 00 55 <8b> 07 48 89 e5 83 f8 01 74 14 b8 ff ff ff ff f0 0f c1 07 83 f8 01 [ 2048.663819] RSP: 0018:ffffc1d105b6fd80 EFLAGS: 00010286 [ 2048.663824] RAX: 0000000000000000 RBX: ffff9d9ac5649000 RCX: 0000000000000000 [ 2048.663827] RDX: ffffffffc0d1daf6 RSI: 0000000000000206 RDI: 0000000000000000 [ 2048.663830] RBP: ffffc1d105b6fd98 R08: 0000000000000001 R09: ffff9d9ace8ceac0 [ 2048.663834] R10: ffff9d9ace8ceac0 R11: 0000000000000001 R12: ffff9d9ac5649000 [ 2048.663838] R13: 0000000000000000 R14: 00007ffe0354d650 R15: 0000000000000000 [ 2048.663843] FS: 00007fe02ab19740(0000) GS:ffff9d9e5f8c0000(0000) knlGS:0000000000000000 [ 2048.663849] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 2048.663853] CR2: 0000000000000000 CR3: 0000000111a52004 CR4: 0000000000770ee0 [ 2048.663856] PKRU: 55555554 [ 2048.663859] Call Trace: [ 2048.663865] ? skb_release_head_state+0x5e/0x80 [ 2048.663873] kfree_skb+0x2f/0xb0 [ 2048.663881] btusb_shutdown_intel_new+0x36/0x60 [btusb] [ 2048.663905] hci_dev_do_close+0x48c/0x5e0 [bluetooth] [ 2048.663954] ? __cond_resched+0x1a/0x50 [ 2048.663962] hci_rfkill_set_block+0x56/0xa0 [bluetooth] [ 2048.664007] rfkill_set_block+0x98/0x170 [ 2048.664016] rfkill_fop_write+0x136/0x1e0 [ 2048.664022] vfs_write+0xc7/0x260 [ 2048.664030] ksys_write+0xb1/0xe0 [ 2048.664035] ? exit_to_user_mode_prepare+0x37/0x1c0 [ 2048.664042] __x64_sys_write+0x1a/0x20 [ 2048.664048] do_syscall_64+0x40/0xb0 [ 2048.664055] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 2048.664060] RIP: 0033:0x7fe02ac23c27 [ 2048.664066] Code: 0d 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24 [ 2048.664070] RSP: 002b:00007ffe0354d638 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 2048.664075] RAX: ffffffffffffffda RBX: 0000000000000001 RCX: 00007fe02ac23c27 [ 2048.664078] RDX: 0000000000000008 RSI: 00007ffe0354d650 RDI: 0000000000000003 [ 2048.664081] RBP: 0000000000000000 R08: 0000559b05998440 R09: 0000559b05998440 [ 2048.664084] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000003 [ 2048.664086] R13: 0000000000000000 R14: ffffffff00000000 R15: 00000000ffffffff
So move the shutdown callback to a place where workqueues are either flushed or cancelled to resolve the issue.
--- net/bluetooth/hci_core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
net/bluetooth/hci_core.c +8 -8
@@ -1609,14 +1609,6 @@ int hci_dev_do_close(struct hci_dev *hdev)BT_DBG ("%s %p" , hdev->name, hdev); -if (!hci_dev_test_flag (hdev,HCI_UNREGISTER ) && - !hci_dev_test_flag (hdev,HCI_USER_CHANNEL ) && -test_bit (HCI_UP , &hdev->flags)) { -/* Execute vendor specific shutdown routine */ -if (hdev->shutdown) - hdev->shutdown (hdev); - } -cancel_delayed_work (&hdev->power_off);hci_request_cancel_all (hdev);
@@ -1690,6 +1682,14 @@ int hci_dev_do_close(struct hci_dev *hdev)clear_bit (HCI_INIT , &hdev->flags); } +if (!hci_dev_test_flag (hdev,HCI_UNREGISTER ) && + !hci_dev_test_flag (hdev,HCI_USER_CHANNEL ) && +test_bit (HCI_UP , &hdev->flags)) { +/* Execute vendor specific shutdown routine */ +if (hdev->shutdown) + hdev->shutdown (hdev); + } +/* flush cmd work */ flush_work (&hdev->cmd_work);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 275/421 Bluetooth: btusb: fix bt fiwmare downloading failure issue for qca btsoc.
In reply to Greg Kroah-HartmanFrom: Tim Jiang <[email protected]>
[ Upstream commit 4f00bfb372674d586c4a261bfc595cbce101fbb6 ]
This is btsoc timing issue, after host start to downloading bt firmware, ep2 need time to switch from function acl to function dfu, so host add 20ms delay as workaround.
--- drivers/bluetooth/btusb.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/bluetooth/btusb.c +5 -0
@@ -2595,6 +2595,11 @@ static int btusb_setup_qca_download_fw(struct hci_dev *hdev, sent += size; count -= size; +/* ep2 need time to switch from function acl to function dfu, +* so we add 20ms delay here. +*/ +msleep (20 ); +while (count) { size =min_t (size_t, count,QCA_DFU_PACKET_LEN );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 276/421 sctp: validate from_addr_param return
In reply to Greg Kroah-HartmanFrom: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit 0c5dc070ff3d6246d22ddd931f23a6266249e3db ]
Ilja reported that, simply putting it, nothing was validating that from_addr_param functions were operating on initialized memory. That is, the parameter itself was being validated by sctp_walk_params, but it doesn't check for types and their specific sizes and it could be a 0-length one, causing from_addr_param to potentially work over the next parameter or even uninitialized memory.
The fix here is to, in all calls to from_addr_param, check if enough space is there for the wanted IP address type.
--- include/net/sctp/structs.h | 2 +- net/sctp/bind_addr.c | 19 +++++++++++-------- net/sctp/input.c | 6 ++++-- net/sctp/ipv6.c | 7 ++++++- net/sctp/protocol.c | 7 ++++++- net/sctp/sm_make_chunk.c | 29 ++++++++++++++++------------- 6 files changed, 44 insertions(+), 26 deletions(-)
include/net/sctp/structs.h +1 -1
@@ -474,7 +474,7 @@ struct sctp_af { int saddr);void (*from_sk) (union sctp_addr *,struct sock *sk); -void (*from_addr_param) (union sctp_addr *, +bool (*from_addr_param) (union sctp_addr *,union sctp_addr_param *,__be16 port,int iif); int (*to_addr_param) (const union sctp_addr *,
net/sctp/bind_addr.c +11 -8
@@ -285,22 +285,19 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list, rawaddr = (union sctp_addr_param *)raw_addr_list; af =sctp_get_af_specific (param_type2af (param->type)); -if (unlikely (!af)) { +if (unlikely (!af) || + !af->from_addr_param (&addr, rawaddr,htons (port),0 )) { retval = -EINVAL ; -sctp_bind_addr_clean (bp); -break ; + goto out_err; } - af->from_addr_param (&addr, rawaddr,htons (port),0 );if (sctp_bind_addr_state (bp, &addr) !=-1 ) goto next; retval =sctp_add_bind_addr (bp, &addr,sizeof (addr),SCTP_ADDR_SRC , gfp); -if (retval) { +if (retval)/* Can't finish building the list, clean up. */ -sctp_bind_addr_clean (bp); -break ; - } + goto out_err; next: len =ntohs (param->length);
@@ -309,6 +306,12 @@ next: }return retval; + +out_err: +if (retval) +sctp_bind_addr_clean (bp); + +return retval; }/********************************************************************
net/sctp/input.c +4 -2
@@ -1088,7 +1088,8 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net,if (!af)continue ; - af->from_addr_param (paddr, params.addr, sh->source,0 ); +if (!af->from_addr_param (paddr, params.addr, sh->source,0 )) +continue ; asoc =__sctp_lookup_association (net, laddr, paddr, transportp);if (asoc)
@@ -1131,7 +1132,8 @@ static struct sctp_association *__sctp_rcv_asconf_lookup(if (unlikely (!af))return NULL ; - af->from_addr_param (&paddr, param, peer_port,0 ); +if (af->from_addr_param (&paddr, param, peer_port,0 )) +return NULL ;return __sctp_lookup_association (net, laddr, &paddr, transportp); }
net/sctp/ipv6.c +6 -1
@@ -542,15 +542,20 @@ static void sctp_v6_to_sk_daddr(union sctp_addr *addr, struct sock *sk) }/* Initialize a sctp_addr from an address parameter. */ -static void sctp_v6_from_addr_param (union sctp_addr *addr, +static bool sctp_v6_from_addr_param (union sctp_addr *addr,union sctp_addr_param *param,__be16 port,int iif) { +if (ntohs (param->v6.param_hdr.length) <sizeof (struct sctp_ipv6addr_param )) +return false; + addr->v6.sin6_family =AF_INET6 ; addr->v6.sin6_port = port; addr->v6.sin6_flowinfo =0 ;/* BUG */ addr->v6.sin6_addr = param->v6.addr; addr->v6.sin6_scope_id = iif; + +return true; }/* Initialize an address parameter from a sctp_addr and return the length
net/sctp/protocol.c +6 -1
@@ -268,14 +268,19 @@ static void sctp_v4_to_sk_daddr(union sctp_addr *addr, struct sock *sk) }/* Initialize a sctp_addr from an address parameter. */ -static void sctp_v4_from_addr_param (union sctp_addr *addr, +static bool sctp_v4_from_addr_param (union sctp_addr *addr,union sctp_addr_param *param,__be16 port,int iif) { +if (ntohs (param->v4.param_hdr.length) <sizeof (struct sctp_ipv4addr_param )) +return false; + addr->v4.sin_family =AF_INET ; addr->v4.sin_port = port; addr->v4.sin_addr.s_addr = param->v4.addr.s_addr;memset (addr->v4.sin_zero,0 ,sizeof (addr->v4.sin_zero)); + +return true; }/* Initialize an address parameter from a sctp_addr and return the length
net/sctp/sm_make_chunk.c +16 -13
@@ -2352,11 +2352,13 @@ int sctp_process_init(struct sctp_association *asoc, struct sctp_chunk *chunk,/* Process the initialization parameters. */ sctp_walk_params(param, peer_init, init_hdr.params) { -if (!src_match && (param.p->type ==SCTP_PARAM_IPV4_ADDRESS || - param.p->type ==SCTP_PARAM_IPV6_ADDRESS )) { +if (!src_match && + (param.p->type ==SCTP_PARAM_IPV4_ADDRESS || + param.p->type ==SCTP_PARAM_IPV6_ADDRESS )) { af =sctp_get_af_specific (param_type2af (param.p->type)); - af->from_addr_param (&addr, param.addr, - chunk->sctp_hdr->source,0 ); +if (!af->from_addr_param (&addr, param.addr, + chunk->sctp_hdr->source,0 )) +continue ;if (sctp_cmp_addr_exact (sctp_source (chunk), &addr)) src_match =1 ; }
@@ -2537,7 +2539,8 @@ static int sctp_process_param(struct sctp_association *asoc,break ; do_addr_param: af =sctp_get_af_specific (param_type2af (param.p->type)); - af->from_addr_param (&addr, param.addr,htons (asoc->peer.port),0 ); +if (!af->from_addr_param (&addr, param.addr,htons (asoc->peer.port),0 )) +break ; scope =sctp_scope (peer_addr);if (sctp_in_scope (net, &addr, scope))if (!sctp_assoc_add_peer (asoc, &addr, gfp,SCTP_UNCONFIRMED ))
@@ -2634,15 +2637,13 @@ do_addr_param: addr_param = param.v +sizeof (struct sctp_addip_param ); af =sctp_get_af_specific (param_type2af (addr_param->p.type)); -if (af ==NULL ) +if (!af)break ; - af->from_addr_param (&addr, addr_param, -htons (asoc->peer.port),0 ); +if (!af->from_addr_param (&addr, addr_param, +htons (asoc->peer.port),0 )) +break ; -/* if the address is invalid, we can't process it. -* XXX: see spec for what to do. -*/ if (!af->addr_valid (&addr,NULL ,NULL ))break ;
@@ -3059,7 +3060,8 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,if (unlikely (!af))return SCTP_ERROR_DNS_FAILED ; - af->from_addr_param (&addr, addr_param,htons (asoc->peer.port),0 ); +if (!af->from_addr_param (&addr, addr_param,htons (asoc->peer.port),0 )) +return SCTP_ERROR_DNS_FAILED ;/* ADDIP 4.2.1 This parameter MUST NOT contain a broadcast * or multicast address.
@@ -3336,7 +3338,8 @@ static void sctp_asconf_param_success(struct sctp_association *asoc,/* We have checked the packet before, so we do not check again. */ af =sctp_get_af_specific (param_type2af (addr_param->p.type)); - af->from_addr_param (&addr, addr_param,htons (bp->port),0 ); +if (!af->from_addr_param (&addr, addr_param,htons (bp->port),0 )) +return ;switch (asconf_param->param_hdr.type) {case SCTP_PARAM_ADD_IP :
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 277/421 sctp: add size validation when walking chunks
In reply to Greg Kroah-HartmanFrom: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit 50619dbf8db77e98d821d615af4f634d08e22698 ]
The first chunk in a packet is ensured to be present at the beginning of sctp_rcv(), as a packet needs to have at least 1 chunk. But the second one, may not be completely available and ch->length can be over uninitialized memory.
Fix here is by only trying to walk on the next chunk if there is enough to hold at least the header, and then proceed with the ch->length validation that is already there.
--- net/sctp/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sctp/input.c +1 -1
@@ -1204,7 +1204,7 @@ static struct sctp_association *__sctp_rcv_walk_lookup(struct net *net, ch = (struct sctp_chunkhdr *)ch_end; chunk_num++; - }while (ch_end <skb_tail_pointer (skb)); + }while (ch_end +sizeof (*ch) <skb_tail_pointer (skb));return asoc; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 278/421 MIPS: set mips32r5 for virt extensions
In reply to Greg Kroah-HartmanFrom: Nick Desaulniers <[email protected]>
[ Upstream commit c994a3ec7ecc8bd2a837b2061e8a76eb8efc082b ]
Clang's integrated assembler only accepts these instructions when the cpu is set to mips32r5. With this change, we can assemble malta_defconfig with Clang via make LLVM_IAS=1.
--- arch/mips/include/asm/mipsregs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/mips/include/asm/mipsregs.h +4 -4
@@ -1986,7 +1986,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c) ({ int __res; \ __asm__ __volatile__( \ ".set\tpush\n\t" \ - ".set\tmips32r2\n\t" \ + ".set\tmips32r5\n\t" \ _ASM_SET_VIRT \ "mfgc0\t%0, " #source ", %1\n\t" \ ".set\tpop" \
@@ -1999,7 +1999,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c) ({ unsigned long long __res; \ __asm__ __volatile__( \ ".set\tpush\n\t" \ - ".set\tmips64r2\n\t" \ + ".set\tmips64r5\n\t" \ _ASM_SET_VIRT \ "dmfgc0\t%0, " #source ", %1\n\t" \ ".set\tpop" \
@@ -2012,7 +2012,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c) do { \ __asm__ __volatile__( \ ".set\tpush\n\t" \ - ".set\tmips32r2\n\t" \ + ".set\tmips32r5\n\t" \ _ASM_SET_VIRT \ "mtgc0\t%z0, " #register ", %1\n\t" \ ".set\tpop" \
@@ -2024,7 +2024,7 @@ do { \ do { \ __asm__ __volatile__( \ ".set\tpush\n\t" \ - ".set\tmips64r2\n\t" \ + ".set\tmips64r5\n\t" \ _ASM_SET_VIRT \ "dmtgc0\t%z0, " #register ", %1\n\t" \ ".set\tpop" \
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 279/421 fscrypt: dont ignore minor_hash when hash is 0
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 77f30bfcfcf484da7208affd6a9e63406420bf91 upstream.
When initializing a no-key name, fscrypt_fname_disk_to_usr() sets the minor_hash to 0 if the (major) hash is 0.
This doesn't make sense because 0 is a valid hash code, so we shouldn't ignore the filesystem-provided minor_hash in that case. Fix this by removing the special case for 'hash == 0'.
This is an old bug that appears to have originated when the encryption code in ext4 and f2fs was moved into fs/crypto/. The original ext4 and f2fs code passed the hash by pointer instead of by value. So 'if (hash)' actually made sense then, as it was checking whether a pointer was NULL. But now the hashes are passed by value, and filesystems just pass 0 for any hashes they don't have. There is no need to handle this any differently from the hashes actually being 0.
It is difficult to reproduce this bug, as it only made a difference in the case where a filename's 32-bit major hash happened to be 0. However, it probably had the largest chance of causing problems on ubifs, since ubifs uses minor_hash to do lookups of no-key names, in addition to using it as a readdir cookie. ext4 only uses minor_hash as a readdir cookie, and f2fs doesn't use minor_hash at all.
--- fs/crypto/fname.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
fs/crypto/fname.c +2 -7
@@ -275,13 +275,8 @@ int fscrypt_fname_disk_to_usr(struct ino oname->name);return 0 ; } -if (hash) { - digested_name.hash = hash; - digested_name.minor_hash = minor_hash; - }else { - digested_name.hash =0 ; - digested_name.minor_hash =0 ; - } + digested_name.hash = hash; + digested_name.minor_hash = minor_hash;memcpy (digested_name.digest,FSCRYPT_FNAME_DIGEST (iname->name, iname->len),FSCRYPT_FNAME_DIGEST_SIZE );
Greg Kroah-Hartman
maintainerPATCH 280/421 bdi: Do not use freezable workqueue
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit a2b90f11217790ec0964ba9c93a4abb369758c26 upstream.
A removable block device, such as NVMe or SSD connected over Thunderbolt can be hot-removed any time including when the system is suspended. When device is hot-removed during suspend and the system gets resumed, kernel first resumes devices and then thaws the userspace including freezable workqueues. What happens in that case is that the NVMe driver notices that the device is unplugged and removes it from the system. This ends up calling bdi_unregister() for the gendisk which then schedules wb_workfn() to be run one more time.
However, since the bdi_wq is still frozen flush_delayed_work() call in wb_shutdown() blocks forever halting system resume process. User sees this as hang as nothing is happening anymore.
Triggering sysrq-w reveals this:
Workqueue: nvme-wq nvme_remove_dead_ctrl_work [nvme] Call Trace: ? __schedule+0x2c5/0x630 ? wait_for_completion+0xa4/0x120 schedule+0x3e/0xc0 schedule_timeout+0x1c9/0x320 ? resched_curr+0x1f/0xd0 ? wait_for_completion+0xa4/0x120 wait_for_completion+0xc3/0x120 ? wake_up_q+0x60/0x60 __flush_work+0x131/0x1e0 ? flush_workqueue_prep_pwqs+0x130/0x130 bdi_unregister+0xb9/0x130 del_gendisk+0x2d2/0x2e0 nvme_ns_remove+0xed/0x110 [nvme_core] nvme_remove_namespaces+0x96/0xd0 [nvme_core] nvme_remove+0x5b/0x160 [nvme] pci_device_remove+0x36/0x90 device_release_driver_internal+0xdf/0x1c0 nvme_remove_dead_ctrl_work+0x14/0x30 [nvme] process_one_work+0x1c2/0x3f0 worker_thread+0x48/0x3e0 kthread+0x100/0x140 ? current_work+0x30/0x30 ? kthread_park+0x80/0x80 ret_from_fork+0x35/0x40
This is not limited to NVMes so exactly same issue can be reproduced by hot-removing SSD (over Thunderbolt) while the system is suspended.
Prevent this from happening by removing WQ_FREEZABLE from bdi_wq.
--- mm/backing-dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/backing-dev.c +2 -2
@@ -250,8 +250,8 @@ static int __init default_bdi_init(void) {int err; - bdi_wq =alloc_workqueue ("writeback" ,WQ_MEM_RECLAIM |WQ_FREEZABLE | -WQ_UNBOUND |WQ_SYSFS ,0 ); + bdi_wq =alloc_workqueue ("writeback" ,WQ_MEM_RECLAIM |WQ_UNBOUND | +WQ_SYSFS ,0 );if (!bdi_wq)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 281/421 serial: mvebu-uart: clarify the baud rate derivation
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 0e4cf69ede8751d25f733cd7a6f954c5b505fa03 upstream.
The current comment in ->set_baud_rate() is rather incomplete as it fails to describe what are the actual stages for the baudrate derivation. Replace this comment with something more explicit and close to the functional specification. Also adapt the variable names to it.
--- drivers/tty/serial/mvebu-uart.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/tty/serial/mvebu-uart.c +14 -8
@@ -72,6 +72,7 @@#define BRDV_BAUD_MASK 0x3FF#define UART_OSAMP 0x14 +#define OSAMP_DEFAULT_DIVISOR 16#define MVEBU_NR_UARTS 2
@@ -444,23 +445,28 @@ static void mvebu_uart_shutdown(struct ustatic int mvebu_uart_baud_rate_set (struct uart_port *port,unsigned int baud) {struct mvebu_uart *mvuart =to_mvuart (port); -unsigned int baud_rate_div; +unsigned int d_divisor, m_divisor;u32 brdv;if (IS_ERR (mvuart->clk))return -PTR_ERR (mvuart->clk);/* -* The UART clock is divided by the value of the divisor to generate -* UCLK_OUT clock, which is 16 times faster than the baudrate. -* This prescaler can achieve all standard baudrates until 230400. -* Higher baudrates could be achieved for the extended UART by using the -* programmable oversampling stack (also called fractional divisor). +* The baudrate is derived from the UART clock thanks to two divisors: +* > D ("baud generator"): can divide the clock from 2 to 2^10 - 1. +* > M ("fractional divisor"): allows a better accuracy for +* baudrates higher than 230400. +* +* As the derivation of M is rather complicated, the code sticks to its +* default value (x16) when all the prescalers are zeroed, and only +* makes use of D to configure the desired baudrate. */ - baud_rate_div =DIV_ROUND_UP (port->uartclk, baud *16 ); + m_divisor =OSAMP_DEFAULT_DIVISOR ; + d_divisor =DIV_ROUND_UP (port->uartclk, baud * m_divisor); + brdv =readl (port->membase +UART_BRDV ); brdv &= ~BRDV_BAUD_MASK ; - brdv |= baud_rate_div; + brdv |= d_divisor;writel (brdv, port->membase +UART_BRDV );return 0 ;
Greg Kroah-Hartman
maintainerPATCH 282/421 serial: mvebu-uart: fix calculation of clock divisor
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 9078204ca5c33ba20443a8623a41a68a9995a70d upstream.
The clock divisor should be rounded to the closest value.
--- drivers/tty/serial/mvebu-uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/mvebu-uart.c +1 -1
@@ -462,7 +462,7 @@ static int mvebu_uart_baud_rate_set(stru* makes use of D to configure the desired baudrate. */ m_divisor =OSAMP_DEFAULT_DIVISOR ; - d_divisor =DIV_ROUND_UP (port->uartclk, baud * m_divisor); + d_divisor =DIV_ROUND_CLOSEST (port->uartclk, baud * m_divisor); brdv =readl (port->membase +UART_BRDV ); brdv &= ~BRDV_BAUD_MASK ;
Greg Kroah-Hartman
maintainerPATCH 283/421 fuse: reject internal errno
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit 49221cf86d18bb66fe95d3338cb33bd4b9880ca5 upstream.
Don't allow userspace to report errors that could be kernel-internal.
--- fs/fuse/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fuse/dev.c +1 -1
@@ -1896,7 +1896,7 @@ static ssize_t fuse_dev_do_write(struct } err = -EINVAL ; -if (oh.error <=-1000 || oh.error >0 ) +if (oh.error <=-512 || oh.error >0 ) goto err_finish;spin_lock (&fpq->lock);
Greg Kroah-Hartman
maintainerPATCH 284/421 powerpc/barrier: Avoid collision with clangs __lwsync macro
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 015d98149b326e0f1f02e44413112ca8b4330543 upstream.
A change in clang 13 results in the __lwsync macro being defined as __builtin_ppc_lwsync, which emits 'lwsync' or 'msync' depending on what the target supports. This breaks the build because of -Werror in arch/powerpc, along with thousands of warnings:
In file included from arch/powerpc/kernel/pmc.c:12:
In file included from include/linux/bug.h:5:
In file included from arch/powerpc/include/asm/bug.h:109:
In file included from include/asm-generic/bug.h:20:
In file included from include/linux/kernel.h:12:
In file included from include/linux/bitops.h:32:
In file included from arch/powerpc/include/asm/bitops.h:62:
arch/powerpc/include/asm/barrier.h:49:9: error: '__lwsync' macro redefined [-Werror,-Wmacro-redefined]
#define __lwsync() __asm__ __volatile__ (stringify_in_c(LWSYNC) : : :"memory")
^
<built-in>:308:9: note: previous definition is here
#define __lwsync __builtin_ppc_lwsync
^1 error generated.
Undefine this macro so that the runtime patching introduced by commit 2d1b2027626d ("powerpc: Fixup lwsync at runtime") continues to work properly with clang and the build no longer breaks.
--- arch/powerpc/include/asm/barrier.h | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/include/asm/barrier.h +2 -0
@@ -44,6 +44,8 @@# define SMPWMB eieio#endif +/* clang defines this macro for a builtin, which will not work with runtime patching */ +#undef __lwsync#define __lwsync () __asm__ __volatile__ (stringify_in_c(LWSYNC) : : :"memory")#define dma_rmb () __lwsync()#define dma_wmb () __asm__ __volatile__ (stringify_in_c(SMPWMB) : : :"memory")
Greg Kroah-Hartman
maintainerPATCH 285/421 usb: gadget: f_fs: Fix setting of device and driver data cross-references
In reply to Greg Kroah-HartmanFrom: Andrew Gabbasov <[email protected]>
commit ecfbd7b9054bddb12cea07fda41bb3a79a7b0149 upstream.
FunctionFS device structure 'struct ffs_dev' and driver data structure 'struct ffs_data' are bound to each other with cross-reference pointers 'ffs_data->private_data' and 'ffs_dev->ffs_data'. While the first one is supposed to be valid through the whole life of 'struct ffs_data' (and while 'struct ffs_dev' exists non-freed), the second one is cleared in 'ffs_closed()' (called from 'ffs_data_reset()' or the last 'ffs_data_put()'). This can be called several times, alternating in different order with 'ffs_free_inst()', that, if possible, clears the other cross-reference.
As a result, different cases of these calls order may leave stale cross-reference pointers, used when the pointed structure is already freed. Even if it occasionally doesn't cause kernel crash, this error is reported by KASAN-enabled kernel configuration.
For example, the case [last 'ffs_data_put()' - 'ffs_free_inst()'] was fixed by commit cdafb6d8b8da ("usb: gadget: f_fs: Fix use-after-free in ffs_free_inst").
The other case ['ffs_data_reset()' - 'ffs_free_inst()' - 'ffs_data_put()'] now causes KASAN reported error [1], when 'ffs_data_reset()' clears 'ffs_dev->ffs_data', then 'ffs_free_inst()' frees the 'struct ffs_dev', but can't clear 'ffs_data->private_data', which is then accessed in 'ffs_closed()' called from 'ffs_data_put()'. This happens since 'ffs_dev->ffs_data' reference is cleared too early.
Moreover, one more use case, when 'ffs_free_inst()' is called immediately after mounting FunctionFS device (that is before the descriptors are written and 'ffs_ready()' is called), and then 'ffs_data_reset()' or 'ffs_data_put()' is called from accessing "ep0" file or unmounting the device. This causes KASAN error report like [2], since 'ffs_dev->ffs_data' is not yet set when 'ffs_free_inst()' can't properly clear 'ffs_data->private_data', that is later accessed to freed structure.
Fix these (and may be other) cases of stale pointers access by moving setting and clearing of the mentioned cross-references to the single places, setting both of them when 'struct ffs_data' is created and bound to 'struct ffs_dev', and clearing both of them when one of the structures is destroyed. It seems convenient to make this pointer initialization and structures binding in 'ffs_acquire_dev()' and make pointers clearing in 'ffs_release_dev()'. This required some changes in these functions parameters and return types.
Also, 'ffs_release_dev()' calling requires some cleanup, fixing minor issues, like (1) 'ffs_release_dev()' is not called if 'ffs_free_inst()' is called without unmounting the device, and "release_dev" callback is not called at all, or (2) "release_dev" callback is called before "ffs_closed" callback on unmounting, which seems to be not correctly nested with "acquire_dev" and "ffs_ready" callbacks.
Make this cleanup togther with other mentioned 'ffs_release_dev()' changes.
[1]
==================================================================
root@rcar-gen3:~# mkdir /dev/cfs root@rcar-gen3:~# mkdir /dev/ffs root@rcar-gen3:~# modprobe libcomposite root@rcar-gen3:~# mount -t configfs none /dev/cfs root@rcar-gen3:~# mkdir /dev/cfs/usb_gadget/g1 root@rcar-gen3:~# mkdir /dev/cfs/usb_gadget/g1/functions/ffs.ffs [ 64.340664] file system registered root@rcar-gen3:~# mount -t functionfs ffs /dev/ffs root@rcar-gen3:~# cd /dev/ffs root@rcar-gen3:/dev/ffs# /home/root/ffs-test ffs-test: info: ep0: writing descriptors (in v2 format) [ 83.181442] read descriptors [ 83.186085] read strings ffs-test: info: ep0: writing strings ffs-test: dbg: ep1: starting ffs-test: dbg: ep2: starting ffs-test: info: ep1: starts ffs-test: info: ep2: starts ffs-test: info: ep0: starts
^C
root@rcar-gen3:/dev/ffs# cd /home/root/ root@rcar-gen3:~# rmdir /dev/cfs/usb_gadget/g1/functions/ffs.ffs [ 98.935061] unloading root@rcar-gen3:~# umount /dev/ffs [ 102.734301] ================================================================== [ 102.742059] BUG: KASAN: use-after-free in ffs_release_dev+0x64/0xa8 [usb_f_fs] [ 102.749683] Write of size 1 at addr ffff0004d46ff549 by task umount/2997 [ 102.756709] [ 102.758311] CPU: 0 PID: 2997 Comm: umount Not tainted 5.13.0-rc4+ #8 [ 102.764971] Hardware name: Renesas Salvator-X board based on r8a77951 (DT) [ 102.772179] Call trace: [ 102.774779] dump_backtrace+0x0/0x330 [ 102.778653] show_stack+0x20/0x2c [ 102.782152] dump_stack+0x11c/0x1ac [ 102.785833] print_address_description.constprop.0+0x30/0x274 [ 102.791862] kasan_report+0x14c/0x1c8 [ 102.795719] __asan_report_store1_noabort+0x34/0x58 [ 102.800840] ffs_release_dev+0x64/0xa8 [usb_f_fs] [ 102.805801] ffs_fs_kill_sb+0x50/0x84 [usb_f_fs] [ 102.810663] deactivate_locked_super+0xa0/0xf0 [ 102.815339] deactivate_super+0x98/0xac [ 102.819378] cleanup_mnt+0xd0/0x1b0 [ 102.823057] __cleanup_mnt+0x1c/0x28 [ 102.826823] task_work_run+0x104/0x180 [ 102.830774] do_notify_resume+0x458/0x14e0 [ 102.835083] work_pending+0xc/0x5f8 [ 102.838762] [ 102.840357] Allocated by task 2988: [ 102.844032] kasan_save_stack+0x28/0x58 [ 102.848071] kasan_set_track+0x28/0x3c [ 102.852016] ____kasan_kmalloc+0x84/0x9c [ 102.856142] __kasan_kmalloc+0x10/0x1c [ 102.860088] __kmalloc+0x214/0x2f8 [ 102.863678] kzalloc.constprop.0+0x14/0x20 [usb_f_fs] [ 102.868990] ffs_alloc_inst+0x8c/0x208 [usb_f_fs] [ 102.873942] try_get_usb_function_instance+0xf0/0x164 [libcomposite] [ 102.880629] usb_get_function_instance+0x64/0x68 [libcomposite] [ 102.886858] function_make+0x128/0x1ec [libcomposite] [ 102.892185] configfs_mkdir+0x330/0x590 [configfs] [ 102.897245] vfs_mkdir+0x12c/0x1bc [ 102.900835] do_mkdirat+0x180/0x1d0 [ 102.904513] __arm64_sys_mkdirat+0x80/0x94 [ 102.908822] invoke_syscall+0xf8/0x25c [ 102.912772] el0_svc_common.constprop.0+0x150/0x1a0 [ 102.917891] do_el0_svc+0xa0/0xd4 [ 102.921386] el0_svc+0x24/0x34 [ 102.924613] el0_sync_handler+0xcc/0x154 [ 102.928743] el0_sync+0x198/0x1c0 [ 102.932238] [ 102.933832] Freed by task 2996: [ 102.937144] kasan_save_stack+0x28/0x58 [ 102.941181] kasan_set_track+0x28/0x3c [ 102.945128] kasan_set_free_info+0x28/0x4c [ 102.949435] ____kasan_slab_free+0x104/0x118 [ 102.953921] __kasan_slab_free+0x18/0x24 [ 102.958047] slab_free_freelist_hook+0x148/0x1f0 [ 102.962897] kfree+0x318/0x440 [ 102.966123] ffs_free_inst+0x164/0x2d8 [usb_f_fs] [ 102.971075] usb_put_function_instance+0x84/0xa4 [libcomposite] [ 102.977302] ffs_attr_release+0x18/0x24 [usb_f_fs] [ 102.982344] config_item_put+0x140/0x1a4 [configfs] [ 102.987486] configfs_rmdir+0x3fc/0x518 [configfs] [ 102.992535] vfs_rmdir+0x114/0x234 [ 102.996122] do_rmdir+0x274/0x2b0 [ 102.999617] __arm64_sys_unlinkat+0x94/0xc8 [ 103.004015] invoke_syscall+0xf8/0x25c [ 103.007961] el0_svc_common.constprop.0+0x150/0x1a0 [ 103.013080] do_el0_svc+0xa0/0xd4 [ 103.016575] el0_svc+0x24/0x34 [ 103.019801] el0_sync_handler+0xcc/0x154 [ 103.023930] el0_sync+0x198/0x1c0 [ 103.027426] [ 103.029020] The buggy address belongs to the object at ffff0004d46ff500 [ 103.029020] which belongs to the cache kmalloc-128 of size 128 [ 103.042079] The buggy address is located 73 bytes inside of [ 103.042079] 128-byte region [ffff0004d46ff500, ffff0004d46ff580) [ 103.054236] The buggy address belongs to the page: [ 103.059262] page:0000000021aa849b refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff0004d46fee00 pfn:0x5146fe [ 103.070437] head:0000000021aa849b order:1 compound_mapcount:0 [ 103.076456] flags: 0x8000000000010200(slab|head|zone=2) [ 103.081948] raw: 8000000000010200 fffffc0013521a80 0000000d0000000d ffff0004c0002300 [ 103.090052] raw: ffff0004d46fee00 000000008020001e 00000001ffffffff 0000000000000000 [ 103.098150] page dumped because: kasan: bad access detected [ 103.103985] [ 103.105578] Memory state around the buggy address: [ 103.110602] ffff0004d46ff400: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 103.118161] ffff0004d46ff480: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 103.125726] >ffff0004d46ff500: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 103.133284] ^ [ 103.139120] ffff0004d46ff580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 103.146679] ffff0004d46ff600: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 103.154238] ================================================================== [ 103.161792] Disabling lock debugging due to kernel taint [ 103.167319] Unable to handle kernel paging request at virtual address 0037801d6000018e [ 103.175406] Mem abort info: [ 103.178457] ESR = 0x96000004 [ 103.181609] EC = 0x25: DABT (current EL), IL = 32 bits [ 103.187020] SET = 0, FnV = 0 [ 103.190185] EA = 0, S1PTW = 0 [ 103.193417] Data abort info: [ 103.196385] ISV = 0, ISS = 0x00000004 [ 103.200315] CM = 0, WnR = 0 [ 103.203366] [0037801d6000018e] address between user and kernel address ranges [ 103.210611] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 103.216231] Modules linked in: usb_f_fs libcomposite configfs ath9k_htc led_class mac80211 libarc4 ath9k_common ath9k_hw ath cfg80211 aes_ce_blk sata_rc4 [ 103.259233] CPU: 0 PID: 2997 Comm: umount Tainted: G B 5.13.0-rc4+ #8 [ 103.267031] Hardware name: Renesas Salvator-X board based on r8a77951 (DT) [ 103.273951] pstate: 00000005 (nzcv daif -PAN -UAO -TCO BTYPE=--) [ 103.280001] pc : ffs_data_clear+0x138/0x370 [usb_f_fs] [ 103.285197] lr : ffs_data_clear+0x124/0x370 [usb_f_fs] [ 103.290385] sp : ffff800014777a80 [ 103.293725] x29: ffff800014777a80 x28: ffff0004d7649c80 x27: 0000000000000000 [ 103.300931] x26: ffff800014777fb0 x25: ffff60009aec9394 x24: ffff0004d7649ca4 [ 103.308136] x23: 1fffe0009a3d063a x22: dfff800000000000 x21: ffff0004d1e831d0 [ 103.315340] x20: e1c000eb00000bb4 x19: ffff0004d1e83000 x18: 0000000000000000 [ 103.322545] x17: 0000000000000000 x16: 0000000000000000 x15: 0000000000000000 [ 103.329748] x14: 0720072007200720 x13: 0720072007200720 x12: 1ffff000012ef658 [ 103.336952] x11: ffff7000012ef658 x10: 0720072007200720 x9 : ffff800011322648 [ 103.344157] x8 : ffff800014777818 x7 : ffff80000977b2c7 x6 : 0000000000000000 [ 103.351359] x5 : 0000000000000001 x4 : ffff7000012ef659 x3 : 0000000000000001 [ 103.358562] x2 : 0000000000000000 x1 : 1c38001d6000018e x0 : e1c000eb00000c70 [ 103.365766] Call trace: [ 103.368235] ffs_data_clear+0x138/0x370 [usb_f_fs] [ 103.373076] ffs_data_reset+0x20/0x304 [usb_f_fs] [ 103.377829] ffs_data_closed+0x1ec/0x244 [usb_f_fs] [ 103.382755] ffs_fs_kill_sb+0x70/0x84 [usb_f_fs] [ 103.387420] deactivate_locked_super+0xa0/0xf0 [ 103.391905] deactivate_super+0x98/0xac [ 103.395776] cleanup_mnt+0xd0/0x1b0 [ 103.399299] __cleanup_mnt+0x1c/0x28 [ 103.402906] task_work_run+0x104/0x180 [ 103.406691] do_notify_resume+0x458/0x14e0 [ 103.410823] work_pending+0xc/0x5f8 [ 103.414351] Code: b4000a54 9102f280 12000802 d343fc01 (38f66821) [ 103.420490] ---[ end trace 57b43a50e8244f57 ]--- Segmentation fault root@rcar-gen3:~# ==================================================================
[2]
==================================================================
root@rcar-gen3:~# mkdir /dev/ffs root@rcar-gen3:~# modprobe libcomposite root@rcar-gen3:~# root@rcar-gen3:~# mount -t configfs none /dev/cfs root@rcar-gen3:~# mkdir /dev/cfs/usb_gadget/g1 root@rcar-gen3:~# mkdir /dev/cfs/usb_gadget/g1/functions/ffs.ffs [ 54.766480] file system registered root@rcar-gen3:~# mount -t functionfs ffs /dev/ffs root@rcar-gen3:~# rmdir /dev/cfs/usb_gadget/g1/functions/ffs.ffs [ 63.197597] unloading root@rcar-gen3:~# cat /dev/ffs/ep0 cat: read error:[ 67.213506] ================================================================== [ 67.222095] BUG: KASAN: use-after-free in ffs_data_clear+0x70/0x370 [usb_f_fs] [ 67.229699] Write of size 1 at addr ffff0004c26e974a by task cat/2994 [ 67.236446] [ 67.238045] CPU: 0 PID: 2994 Comm: cat Not tainted 5.13.0-rc4+ #8 [ 67.244431] Hardware name: Renesas Salvator-X board based on r8a77951 (DT) [ 67.251624] Call trace: [ 67.254212] dump_backtrace+0x0/0x330 [ 67.258081] show_stack+0x20/0x2c [ 67.261579] dump_stack+0x11c/0x1ac [ 67.265260] print_address_description.constprop.0+0x30/0x274 [ 67.271286] kasan_report+0x14c/0x1c8 [ 67.275143] __asan_report_store1_noabort+0x34/0x58 [ 67.280265] ffs_data_clear+0x70/0x370 [usb_f_fs] [ 67.285220] ffs_data_reset+0x20/0x304 [usb_f_fs] [ 67.290172] ffs_data_closed+0x240/0x244 [usb_f_fs] [ 67.295305] ffs_ep0_release+0x40/0x54 [usb_f_fs] [ 67.300256] __fput+0x304/0x580 [ 67.303576] ____fput+0x18/0x24 [ 67.306893] task_work_run+0x104/0x180 [ 67.310846] do_notify_resume+0x458/0x14e0 [ 67.315154] work_pending+0xc/0x5f8 [ 67.318834] [ 67.320429] Allocated by task 2988: [ 67.324105] kasan_save_stack+0x28/0x58 [ 67.328144] kasan_set_track+0x28/0x3c [ 67.332090] ____kasan_kmalloc+0x84/0x9c [ 67.336217] __kasan_kmalloc+0x10/0x1c [ 67.340163] __kmalloc+0x214/0x2f8 [ 67.343754] kzalloc.constprop.0+0x14/0x20 [usb_f_fs] [ 67.349066] ffs_alloc_inst+0x8c/0x208 [usb_f_fs] [ 67.354017] try_get_usb_function_instance+0xf0/0x164 [libcomposite] [ 67.360705] usb_get_function_instance+0x64/0x68 [libcomposite] [ 67.366934] function_make+0x128/0x1ec [libcomposite] [ 67.372260] configfs_mkdir+0x330/0x590 [configfs] [ 67.377320] vfs_mkdir+0x12c/0x1bc [ 67.380911] do_mkdirat+0x180/0x1d0 [ 67.384589] __arm64_sys_mkdirat+0x80/0x94 [ 67.388899] invoke_syscall+0xf8/0x25c [ 67.392850] el0_svc_common.constprop.0+0x150/0x1a0 [ 67.397969] do_el0_svc+0xa0/0xd4 [ 67.401464] el0_svc+0x24/0x34 [ 67.404691] el0_sync_handler+0xcc/0x154 [ 67.408819] el0_sync+0x198/0x1c0 [ 67.412315] [ 67.413909] Freed by task 2993: [ 67.417220] kasan_save_stack+0x28/0x58 [ 67.421257] kasan_set_track+0x28/0x3c [ 67.425204] kasan_set_free_info+0x28/0x4c [ 67.429513] ____kasan_slab_free+0x104/0x118 [ 67.434001] __kasan_slab_free+0x18/0x24 [ 67.438128] slab_free_freelist_hook+0x148/0x1f0 [ 67.442978] kfree+0x318/0x440 [ 67.446205] ffs_free_inst+0x164/0x2d8 [usb_f_fs] [ 67.451156] usb_put_function_instance+0x84/0xa4 [libcomposite] [ 67.457385] ffs_attr_release+0x18/0x24 [usb_f_fs] [ 67.462428] config_item_put+0x140/0x1a4 [configfs] [ 67.467570] configfs_rmdir+0x3fc/0x518 [configfs] [ 67.472626] vfs_rmdir+0x114/0x234 [ 67.476215] do_rmdir+0x274/0x2b0 [ 67.479710] __arm64_sys_unlinkat+0x94/0xc8 [ 67.484108] invoke_syscall+0xf8/0x25c [ 67.488055] el0_svc_common.constprop.0+0x150/0x1a0 [ 67.493175] do_el0_svc+0xa0/0xd4 [ 67.496671] el0_svc+0x24/0x34 [ 67.499896] el0_sync_handler+0xcc/0x154 [ 67.504024] el0_sync+0x198/0x1c0 [ 67.507520] [ 67.509114] The buggy address belongs to the object at ffff0004c26e9700 [ 67.509114] which belongs to the cache kmalloc-128 of size 128 [ 67.522171] The buggy address is located 74 bytes inside of [ 67.522171] 128-byte region [ffff0004c26e9700, ffff0004c26e9780) [ 67.534328] The buggy address belongs to the page: [ 67.539355] page:000000003177a217 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x5026e8 [ 67.549175] head:000000003177a217 order:1 compound_mapcount:0 [ 67.555195] flags: 0x8000000000010200(slab|head|zone=2) [ 67.560687] raw: 8000000000010200 fffffc0013037100 0000000c00000002 ffff0004c0002300 [ 67.568791] raw: 0000000000000000 0000000080200020 00000001ffffffff 0000000000000000 [ 67.576890] page dumped because: kasan: bad access detected [ 67.582725] [ 67.584318] Memory state around the buggy address: [ 67.589343] ffff0004c26e9600: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 67.596903] ffff0004c26e9680: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 67.604463] >ffff0004c26e9700: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 67.612022] ^ [ 67.617860] ffff0004c26e9780: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 67.625421] ffff0004c26e9800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 67.632981] ================================================================== [ 67.640535] Disabling lock debugging due to kernel taint File descriptor[ 67.646100] Unable to handle kernel paging request at virtual address fabb801d4000018d in bad state [ 67.655456] Mem abort info: [ 67.659619] ESR = 0x96000004 [ 67.662801] EC = 0x25: DABT (current EL), IL = 32 bits [ 67.668225] SET = 0, FnV = 0 [ 67.671375] EA = 0, S1PTW = 0 [ 67.674613] Data abort info: [ 67.677587] ISV = 0, ISS = 0x00000004 [ 67.681522] CM = 0, WnR = 0 [ 67.684588] [fabb801d4000018d] address between user and kernel address ranges [ 67.691849] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 67.697470] Modules linked in: usb_f_fs libcomposite configfs ath9k_htc led_class mac80211 libarc4 ath9k_common ath9k_hw ath cfg80211 aes_ce_blk crypto_simd cryptd aes_ce_cipher ghash_ce gf128mul sha2_ce sha1_ce evdev sata_rcar libata xhci_plat_hcd scsi_mod xhci_hcd rene4 [ 67.740467] CPU: 0 PID: 2994 Comm: cat Tainted: G B 5.13.0-rc4+ #8 [ 67.748005] Hardware name: Renesas Salvator-X board based on r8a77951 (DT) [ 67.754924] pstate: 00000005 (nzcv daif -PAN -UAO -TCO BTYPE=--) [ 67.760974] pc : ffs_data_clear+0x138/0x370 [usb_f_fs] [ 67.766178] lr : ffs_data_clear+0x124/0x370 [usb_f_fs] [ 67.771365] sp : ffff800014767ad0 [ 67.774706] x29: ffff800014767ad0 x28: ffff800009cf91c0 x27: ffff0004c54861a0 [ 67.781913] x26: ffff0004dc90b288 x25: 1fffe00099ec10f5 x24: 00000000000a801d [ 67.789118] x23: 1fffe00099f6953a x22: dfff800000000000 x21: ffff0004cfb4a9d0 [ 67.796322] x20: d5e000ea00000bb1 x19: ffff0004cfb4a800 x18: 0000000000000000 [ 67.803526] x17: 0000000000000000 x16: 0000000000000000 x15: 0000000000000000 [ 67.810730] x14: 0720072007200720 x13: 0720072007200720 x12: 1ffff000028ecefa [ 67.817934] x11: ffff7000028ecefa x10: 0720072007200720 x9 : ffff80001132c014 [ 67.825137] x8 : ffff8000147677d8 x7 : ffff8000147677d7 x6 : 0000000000000000 [ 67.832341] x5 : 0000000000000001 x4 : ffff7000028ecefb x3 : 0000000000000001 [ 67.839544] x2 : 0000000000000005 x1 : 1abc001d4000018d x0 : d5e000ea00000c6d [ 67.846748] Call trace: [ 67.849218] ffs_data_clear+0x138/0x370 [usb_f_fs] [ 67.854058] ffs_data_reset+0x20/0x304 [usb_f_fs] [ 67.858810] ffs_data_closed+0x240/0x244 [usb_f_fs] [ 67.863736] ffs_ep0_release+0x40/0x54 [usb_f_fs] [ 67.868488] __fput+0x304/0x580 [ 67.871665] ____fput+0x18/0x24 [ 67.874837] task_work_run+0x104/0x180 [ 67.878622] do_notify_resume+0x458/0x14e0 [ 67.882754] work_pending+0xc/0x5f8 [ 67.886282] Code: b4000a54 9102f280 12000802 d343fc01 (38f66821) [ 67.892422] ---[ end trace 6d7cedf53d7abbea ]--- Segmentation fault root@rcar-gen3:~# ==================================================================
--- drivers/usb/gadget/function/f_fs.c | 67 +++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 35 deletions(-)
drivers/usb/gadget/function/f_fs.c +32 -35
@@ -243,8 +243,8 @@ EXPORT_SYMBOL_GPL(ffs_lock);static struct ffs_dev *_ffs_find_dev (const char *name);static struct ffs_dev *_ffs_alloc_dev (void );static void _ffs_free_dev (struct ffs_dev *dev); -static void *ffs_acquire_dev (const char *dev_name); -static void ffs_release_dev (struct ffs_data *ffs_data); +static int ffs_acquire_dev (const char *dev_name,struct ffs_data *ffs_data); +static void ffs_release_dev (struct ffs_dev *ffs_dev);static int ffs_ready (struct ffs_data *ffs);static void ffs_closed (struct ffs_data *ffs);
@@ -1515,7 +1515,6 @@ ffs_fs_mount(struct file_system_type *t, };struct dentry *rv;int ret; -void *ffs_dev;struct ffs_data *ffs;ENTER ();
@@ -1536,19 +1535,16 @@ ffs_fs_mount(struct file_system_type *t,return ERR_PTR (-ENOMEM ); } - ffs_dev =ffs_acquire_dev (dev_name); -if (IS_ERR (ffs_dev)) { + ret =ffs_acquire_dev (dev_name, ffs); +if (ret) {ffs_data_put (ffs); -return ERR_CAST (ffs_dev); +return ERR_PTR (ret); } - ffs->private_data = ffs_dev; data.ffs_data = ffs; rv =mount_nodev (t, flags, &data, ffs_sb_fill); -if (IS_ERR (rv) && data.ffs_data) { -ffs_release_dev (data.ffs_data); +if (IS_ERR (rv) && data.ffs_data)ffs_data_put (data.ffs_data); - }return rv; }
@@ -1558,10 +1554,8 @@ ffs_fs_kill_sb(struct super_block *sb)ENTER ();kill_litter_super (sb); -if (sb->s_fs_info) { -ffs_release_dev (sb->s_fs_info); +if (sb->s_fs_info)ffs_data_closed (sb->s_fs_info); - } }static struct file_system_type ffs_fs_type = {
@@ -1630,6 +1624,7 @@ static void ffs_data_put(struct ffs_dataif (unlikely (refcount_dec_and_test (&ffs->ref))) {pr_info ("%s(): freeing\n" , __func__);ffs_data_clear (ffs); +ffs_release_dev (ffs->private_data);BUG_ON (waitqueue_active (&ffs->ev.waitq) ||waitqueue_active (&ffs->ep0req_completion.wait) ||waitqueue_active (&ffs->wait));
@@ -2934,6 +2929,7 @@ static inline struct f_fs_opts *ffs_do_fstruct ffs_function *func =ffs_func_from_usb (f);struct f_fs_opts *ffs_opts = container_of(f->fi, struct f_fs_opts, func_inst); +struct ffs_data *ffs_data;int ret;ENTER ();
@@ -2948,12 +2944,13 @@ static inline struct f_fs_opts *ffs_do_fif (!ffs_opts->no_configfs)ffs_dev_lock (); ret = ffs_opts->dev->desc_ready ?0 : -ENODEV ; - func->ffs = ffs_opts->dev->ffs_data; + ffs_data = ffs_opts->dev->ffs_data;if (!ffs_opts->no_configfs)ffs_dev_unlock ();if (ret)return ERR_PTR (ret); + func->ffs = ffs_data; func->conf = c; func->gadget = c->cdev->gadget;
@@ -3408,6 +3405,7 @@ static void ffs_free_inst(struct usb_funstruct f_fs_opts *opts; opts =to_f_fs_opts (f); +ffs_release_dev (opts->dev);ffs_dev_lock ();_ffs_free_dev (opts->dev);ffs_dev_unlock ();
@@ -3595,47 +3593,48 @@ static void _ffs_free_dev(struct ffs_dev {list_del (&dev->entry); -/* Clear the private_data pointer to stop incorrect dev access */ -if (dev->ffs_data) - dev->ffs_data->private_data =NULL ; -kfree (dev);if (list_empty (&ffs_devices))functionfs_cleanup (); } -static void *ffs_acquire_dev (const char *dev_name) +static int ffs_acquire_dev (const char *dev_name,struct ffs_data *ffs_data) { +int ret =0 ;struct ffs_dev *ffs_dev;ENTER ();ffs_dev_lock (); ffs_dev =_ffs_find_dev (dev_name); -if (!ffs_dev) - ffs_dev =ERR_PTR (-ENOENT ); -else if (ffs_dev->mounted) - ffs_dev =ERR_PTR (-EBUSY ); -else if (ffs_dev->ffs_acquire_dev_callback && - ffs_dev->ffs_acquire_dev_callback (ffs_dev)) - ffs_dev =ERR_PTR (-ENOENT ); -else +if (!ffs_dev) { + ret = -ENOENT ; + }else if (ffs_dev->mounted) { + ret = -EBUSY ; + }else if (ffs_dev->ffs_acquire_dev_callback && + ffs_dev->ffs_acquire_dev_callback (ffs_dev)) { + ret = -ENOENT ; + }else { ffs_dev->mounted = true; + ffs_dev->ffs_data = ffs_data; + ffs_data->private_data = ffs_dev; + }ffs_dev_unlock (); -return ffs_dev; +return ret; } -static void ffs_release_dev (struct ffs_data *ffs_data) +static void ffs_release_dev (struct ffs_dev *ffs_dev) { -struct ffs_dev *ffs_dev; -ENTER ();ffs_dev_lock (); - ffs_dev = ffs_data->private_data; -if (ffs_dev) { +if (ffs_dev && ffs_dev->mounted) { ffs_dev->mounted = false; +if (ffs_dev->ffs_data) { + ffs_dev->ffs_data->private_data =NULL ; + ffs_dev->ffs_data =NULL ; + }if (ffs_dev->ffs_release_dev_callback) ffs_dev->ffs_release_dev_callback (ffs_dev);
@@ -3663,7 +3662,6 @@ static int ffs_ready(struct ffs_data *ff } ffs_obj->desc_ready = true; - ffs_obj->ffs_data = ffs;if (ffs_obj->ffs_ready_callback) { ret = ffs_obj->ffs_ready_callback (ffs);
@@ -3691,7 +3689,6 @@ static void ffs_closed(struct ffs_data * goto done; ffs_obj->desc_ready = false; - ffs_obj->ffs_data =NULL ;if (test_and_clear_bit (FFS_FL_CALL_CLOSED_CALLBACK , &ffs->flags) && ffs_obj->ffs_closed_callback)
Greg Kroah-Hartman
maintainerPATCH 286/421 drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create()
In reply to Greg Kroah-HartmanFrom: Jing Xiangfeng <[email protected]>
commit 9ba85914c36c8fed9bf3e8b69c0782908c1247b7 upstream.
radeon_user_framebuffer_create() misses to call drm_gem_object_put() in an error path. Add the missed function call to fix it.
--- drivers/gpu/drm/radeon/radeon_display.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/radeon/radeon_display.c +1 -0
@@ -1327,6 +1327,7 @@ radeon_user_framebuffer_create(struct dr/* Handle is imported dma-buf, so cannot be migrated to VRAM for scanout */ if (obj->import_attach) {DRM_DEBUG_KMS ("Cannot create framebuffer from imported dma_buf\n" ); +drm_gem_object_put (obj);return ERR_PTR (-EINVAL ); }
Greg Kroah-Hartman
maintainerPATCH 287/421 drm/amd/display: fix incorrrect valid irq check
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
commit e38ca7e422791a4d1c01e56dbf7f9982db0ed365 upstream.
valid DAL irq should be < DAL_IRQ_SOURCES_NUMBER.
--- drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/irq_types.h +1 -1
@@ -155,7 +155,7 @@ enum irq_type };#define DAL_VALID_IRQ_SRC_NUM (src) \ - ((src) <= DAL_IRQ_SOURCES_NUMBER && (src) > DC_IRQ_SOURCE_INVALID) + ((src) < DAL_IRQ_SOURCES_NUMBER && (src) > DC_IRQ_SOURCE_INVALID)/* Number of Page Flip IRQ Sources. */ #define DAL_PFLIP_IRQ_SRC_NUM \
Greg Kroah-Hartman
maintainerPATCH 288/421 pinctrl/amd: Add device HID for new AMD GPIO controller
In reply to Greg Kroah-HartmanFrom: Maximilian Luz <[email protected]>
commit 1ca46d3e43569186bd1decfb02a6b4c4ddb4304b upstream.
Add device HID AMDI0031 to the AMD GPIO controller driver match table. This controller can be found on Microsoft Surface Laptop 4 devices and seems similar enough that we can just copy the existing AMDI0030 entry.
--- drivers/pinctrl/pinctrl-amd.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/pinctrl-amd.c +1 -0
@@ -966,6 +966,7 @@ static int amd_gpio_remove(struct platfostatic const struct acpi_device_id amd_gpio_acpi_match[] = { {"AMD0030" ,0 }, {"AMDI0030" ,0 }, + {"AMDI0031" ,0 }, { }, };MODULE_DEVICE_TABLE (acpi, amd_gpio_acpi_match);
Greg Kroah-Hartman
maintainerPATCH 289/421 drm/msm/mdp4: Fix modifier support enabling
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
commit 35cbb8c91e9cf310277d3dfb4d046df8edf2df33 upstream.
Setting the cap without the modifier list is very confusing to userspace. Fix that by listing the ones we support explicitly.
Stable backport so that userspace can rely on this working in a reasonable way, i.e. that the cap set implies IN_FORMATS is available.
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 -- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +0 -2
@@ -96,8 +96,6 @@ static int mdp4_hw_init(struct msm_kms *if (mdp4_kms->rev >1 )mdp4_write (mdp4_kms,REG_MDP4_RESET_STATUS ,1 ); - dev->mode_config.allow_fb_modifiers = true; - out:pm_runtime_put_sync (dev->dev);
drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +7 -1
@@ -356,6 +356,12 @@ enum mdp4_pipe mdp4_plane_pipe(struct drreturn mdp4_plane->pipe; } +static const uint64_t supported_format_modifiers[] = { +DRM_FORMAT_MOD_SAMSUNG_64_32_TILE , +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; +/* initialize plane */ struct drm_plane *mdp4_plane_init (struct drm_device *dev,enum mdp4_pipe pipe_id,bool private_plane)
@@ -384,7 +390,7 @@ struct drm_plane *mdp4_plane_init(struct type = private_plane ?DRM_PLANE_TYPE_PRIMARY :DRM_PLANE_TYPE_OVERLAY ; ret =drm_universal_plane_init (dev, plane,0xff , &mdp4_plane_funcs, mdp4_plane->formats, mdp4_plane->nformats, -NULL , type,NULL ); + supported_format_modifiers, type,NULL );if (ret) goto fail;
Greg Kroah-Hartman
maintainerPATCH 290/421 mmc: sdhci: Fix warning message when accessing RPMB in HS400 mode
In reply to Greg Kroah-HartmanFrom: Al Cooper <[email protected]>
commit d0244847f9fc5e20df8b7483c8a4717fe0432d38 upstream.
When an eMMC device is being run in HS400 mode, any access to the RPMB device will cause the error message "mmc1: Invalid UHS-I mode selected". This happens as a result of tuning being disabled before RPMB access and then re-enabled after the RPMB access is complete. When tuning is re-enabled, the system has to switch from HS400 to HS200 to do the tuning and then back to HS400. As part of sequence to switch from HS400 to HS200 the system is temporarily put into HS mode. When switching to HS mode, sdhci_get_preset_value() is called and does not have support for HS mode and prints the warning message and returns the preset for SDR12. The fix is to add support for MMC and SD HS modes to sdhci_get_preset_value().
This can be reproduced on any system running eMMC in HS400 mode (not HS400ES) by using the "mmc" utility to run the following
command: "mmc rpmb read-counter /dev/mmcblk0rpmb".
--- drivers/mmc/host/sdhci.c | 4 ++++ drivers/mmc/host/sdhci.h | 1 + 2 files changed, 5 insertions(+)
drivers/mmc/host/sdhci.c +4 -0
@@ -1371,6 +1371,10 @@ static u16 sdhci_get_preset_value(structu16 preset =0 ;switch (host->timing) { +case MMC_TIMING_MMC_HS : +case MMC_TIMING_SD_HS : + preset =sdhci_readw (host,SDHCI_PRESET_FOR_HIGH_SPEED ); +break ;case MMC_TIMING_UHS_SDR12 : preset =sdhci_readw (host,SDHCI_PRESET_FOR_SDR12 );break ;
drivers/mmc/host/sdhci.h +1 -0
@@ -252,6 +252,7 @@/* 60-FB reserved */ +#define SDHCI_PRESET_FOR_HIGH_SPEED 0x64#define SDHCI_PRESET_FOR_SDR12 0x66#define SDHCI_PRESET_FOR_SDR25 0x68#define SDHCI_PRESET_FOR_SDR50 0x6A
Greg Kroah-Hartman
maintainerPATCH 291/421 mmc: core: clear flags before allowing to retune
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
commit 77347eda64ed5c9383961d1de9165f9d0b7d8df6 upstream.
It might be that something goes wrong during tuning so the MMC core will immediately trigger a retune. In our case it was:
- we sent a tuning block
- there was an error so we need to send an abort cmd to the eMMC
- the abort cmd had a CRC error
- retune was set by the MMC core
This lead to a vicious circle causing a performance regression of 75%. So, clear retuning flags before we enable retuning to start with a known cleared state.
Reported-by Yoshihiro Shimoda <[email protected]>
--- drivers/mmc/core/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/core/core.c +5 -2
@@ -980,11 +980,14 @@ int mmc_execute_tuning(struct mmc_card * err = host->ops->execute_tuning (host, opcode); -if (err) +if (err) {pr_err ("%s: tuning execution failed: %d\n" ,mmc_hostname (host), err); -else + }else { + host->retune_now =0 ; + host->need_retune =0 ;mmc_retune_enable (host); + }return err; }
Greg Kroah-Hartman
maintainerPATCH 292/421 mmc: core: Allow UHS-I voltage switch for SDSC cards if supported
In reply to Greg Kroah-HartmanFrom: Christian Löhle <[email protected]>
commit 09247e110b2efce3a104e57e887c373e0a57a412 upstream.
While initializing an UHS-I SD card, the mmc core first tries to switch to 1.8V I/O voltage, before it continues to change the settings for the bus speed mode.
However, the current behaviour in the mmc core is inconsistent and doesn't conform to the SD spec. More precisely, an SD card that supports UHS-I must set both the SD_OCR_CCS bit and the SD_OCR_S18R bit in the OCR register response. When switching to 1.8V I/O the mmc core correctly checks both of the bits, but only the SD_OCR_S18R bit when changing the settings for bus speed mode.
Rather than actually fixing the code to confirm to the SD spec, let's deliberately deviate from it by requiring only the SD_OCR_S18R bit for both parts. This enables us to support UHS-I for SDSC cards (outside spec), which is actually being supported by some existing SDSC cards. Moreover, this fixes the inconsistent behaviour.
--- drivers/mmc/core/sd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/mmc/core/sd.c +6 -4
@@ -781,11 +781,13 @@ try_again:return err;/* -* In case CCS and S18A in the response is set, start Signal Voltage -* Switch procedure. SPI mode doesn't support CMD11. +* In case the S18A bit is set in the response, let's start the signal +* voltage switch procedure. SPI mode doesn't support CMD11. +* Note that, according to the spec, the S18A bit is not valid unless +* the CCS bit is set as well. We deliberately deviate from the spec in +* regards to this, which allows UHS-I to be supported for SDSC cards. */ -if (!mmc_host_is_spi (host) && rocr && - ((*rocr &0x41000000 ) ==0x41000000 )) { +if (!mmc_host_is_spi (host) && rocr && (*rocr &0x01000000 )) { err =mmc_set_uhs_voltage (host, pocr);if (err == -EAGAIN ) { retries--;
Greg Kroah-Hartman
maintainerPATCH 293/421 ata: ahci_sunxi: Disable DIPM
In reply to Greg Kroah-HartmanFrom: Timo Sigurdsson <[email protected]>
commit f6bca4d91b2ea052e917cca3f9d866b5cc1d500a upstream.
DIPM is unsupported or broken on sunxi. Trying to enable the power management policy med_power_with_dipm on an Allwinner A20 SoC based board leads to immediate I/O errors and the attached SATA disk disappears from the /dev filesystem. A reset (power cycle) is required to make the SATA controller or disk work again. The A10 and A20 SoC data sheets and manuals don't mention DIPM at all [1], so it's fair to assume that it's simply not supported. But even if it was, it should be considered broken and best be disabled in the ahci_sunxi driver.
[1] https://github.com/allwinner-zh/documents/tree/master/
--- drivers/ata/ahci_sunxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/ahci_sunxi.c +1 -1
@@ -165,7 +165,7 @@ static void ahci_sunxi_start_engine(stru }static const struct ata_port_info ahci_sunxi_port_info = { - .flags =AHCI_FLAG_COMMON |ATA_FLAG_NCQ , + .flags =AHCI_FLAG_COMMON |ATA_FLAG_NCQ |ATA_FLAG_NO_DIPM , .pio_mask =ATA_PIO4 , .udma_mask =ATA_UDMA6 , .port_ops = &ahci_platform_ops,
Greg Kroah-Hartman
maintainerPATCH 294/421 cpu/hotplug: Cure the cpusets trainwreck
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit b22afcdf04c96ca58327784e280e10288cfd3303 upstream.
Alexey and Joshua tried to solve a cpusets related hotplug problem which is user space visible and results in unexpected behaviour for some time after a CPU has been plugged in and the corresponding uevent was delivered.
cpusets delegate the hotplug work (rebuilding cpumasks etc.) to a workqueue. This is done because the cpusets code has already a lock nesting of cgroups_mutex -> cpu_hotplug_lock. A synchronous callback or waiting for the work to finish with cpu_hotplug_lock held can and will deadlock because that results in the reverse lock order.
As a consequence the uevent can be delivered before cpusets have consistent state which means that a user space invocation of sched_setaffinity() to move a task to the plugged CPU fails up to the point where the scheduled work has been processed.
The same is true for CPU unplug, but that does not create user observable failure (yet).
It's still inconsistent to claim that an operation is finished before it actually is and that's the real issue at hand. uevents just make it reliably observable.
Obviously the problem should be fixed in cpusets/cgroups, but untangling that is pretty much impossible because according to the changelog of the commit which introduced this 8 years ago:
3a5a6d0c2b03("cpuset: don't nest cgroup_mutex inside get_online_cpus()")
the lock order cgroups_mutex -> cpu_hotplug_lock is a design decision and the whole code is built around that.
So bite the bullet and invoke the relevant cpuset function, which waits for the work to finish, in _cpu_up/down() after dropping cpu_hotplug_lock and only when tasks are not frozen by suspend/hibernate because that would obviously wait forever.
Waiting there with cpu_add_remove_lock, which is protecting the present and possible CPU maps, held is not a problem at all because neither work queues nor cpusets/cgroups have any lockchains related to that lock.
Waiting in the hotplug machinery is not problematic either because there are already state callbacks which wait for hardware queues to drain. It makes the operations slightly slower, but hotplug is slow anyway.
This ensures that state is consistent before returning from a hotplug up/down operation. It's still inconsistent during the operation, but that's a different story.
Add a large comment which explains why this is done and why this is not a dump ground for the hack of the day to work around half thought out locking schemes. Document also the implications vs. hotplug operations and serialization or the lack of it.
Thanks to Alexy and Joshua for analyzing why this temporary sched_setaffinity() failure happened.
--- kernel/cpu.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
kernel/cpu.c +49 -0
@@ -31,6 +31,7 @@#include <linux/relay.h> #include <linux/slab.h> #include <linux/percpu-rwsem.h> +#include <linux/cpuset.h> #include <trace/events/power.h> #define CREATE_TRACE_POINTS
@@ -775,6 +776,52 @@ void __init cpuhp_threads_init(void)kthread_unpark (this_cpu_read (cpuhp_state.thread)); } +/* +* +* Serialize hotplug trainwrecks outside of the cpu_hotplug_lock +* protected region. +* +* The operation is still serialized against concurrent CPU hotplug via +* cpu_add_remove_lock, i.e. CPU map protection. But it is _not_ +* serialized against other hotplug related activity like adding or +* removing of state callbacks and state instances, which invoke either the +* startup or the teardown callback of the affected state. +* +* This is required for subsystems which are unfixable vs. CPU hotplug and +* evade lock inversion problems by scheduling work which has to be +* completed _before_ cpu_up()/_cpu_down() returns. +* +* Don't even think about adding anything to this for any new code or even +* drivers. It's only purpose is to keep existing lock order trainwrecks +* working. +* +* For cpu_down() there might be valid reasons to finish cleanups which are +* not required to be done under cpu_hotplug_lock, but that's a different +* story and would be not invoked via this. +*/ +static void cpu_up_down_serialize_trainwrecks (bool tasks_frozen) +{ +/* +* cpusets delegate hotplug operations to a worker to "solve" the +* lock order problems. Wait for the worker, but only if tasks are +* _not_ frozen (suspend, hibernate) as that would wait forever. +* +* The wait is required because otherwise the hotplug operation +* returns with inconsistent state, which could even be observed in +* user space when a new CPU is brought up. The CPU plug uevent +* would be delivered and user space reacting on it would fail to +* move tasks to the newly plugged CPU up to the point where the +* work has finished because up to that point the newly plugged CPU +* is not assignable in cpusets/cgroups. On unplug that's not +* necessarily a visible issue, but it is still inconsistent state, +* which is the real problem which needs to be "fixed". This can't +* prevent the transient state between scheduling the work and +* returning from waiting for it. +*/ +if (!tasks_frozen) +cpuset_wait_for_hotplug (); +} +#ifdef CONFIG_HOTPLUG_CPU #ifndef arch_clear_mm_cpumask_cpu#define arch_clear_mm_cpumask_cpu (cpu, mm) cpumask_clear_cpu(cpu, mm_cpumask(mm))
@@ -1010,6 +1057,7 @@ out:*/ lockup_detector_cleanup ();arch_smt_update (); +cpu_up_down_serialize_trainwrecks (tasks_frozen);return ret; }
@@ -1145,6 +1193,7 @@ static int _cpu_up(unsigned int cpu, int out:cpus_write_unlock ();arch_smt_update (); +cpu_up_down_serialize_trainwrecks (tasks_frozen);return ret; }
Greg Kroah-Hartman
maintainerPATCH 295/421 clocksource/arm_arch_timer: Improve Allwinner A64 timer workaround
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
commit 8b33dfe0ba1c84c1aab2456590b38195837f1e6e upstream.
Bad counter reads are experienced sometimes when bit 10 or greater rolls over. Originally, testing showed that at least 10 lower bits would be set to the same value during these bad reads. However, some users still reported time skips.
Wider testing revealed that on some chips, occasionally only the lowest 9 bits would read as the anomalous value. During these reads (which still happen only when bit 10), bit 9 would read as the correct value.
Reduce the mask by one bit to cover these cases as well.
--- drivers/clocksource/arm_arch_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/arm_arch_timer.c +1 -1
@@ -334,7 +334,7 @@ static u64 notrace arm64_858921_read_cntdo { \ _val =read_sysreg (reg); \ _retries--; \ - }while (((_val +1 ) &GENMASK (9 ,0 )) <=1 && _retries); \ + }while (((_val +1 ) &GENMASK (8 ,0 )) <=1 && _retries); \ \WARN_ON_ONCE (!_retries); \ _val; \
Greg Kroah-Hartman
maintainerPATCH 296/421 ASoC: tegra: Set driver_name=tegra for all machine drivers
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit f6eb84fa596abf28959fc7e0b626f925eb1196c7 upstream.
The driver_name="tegra" is now required by the newer ALSA UCMs, otherwise Tegra UCMs don't match by the path/name.
All Tegra machine drivers are specifying the card's name, but it has no effect if model name is specified in the device-tree since it overrides the card's name. We need to set the driver_name to "tegra" in order to get a usable lookup path for the updated ALSA UCMs. The new UCM lookup path has a form of driver_name/card_name.
The old lookup paths that are based on driver module name continue to work as before. Note that UCM matching never worked for Tegra ASoC drivers if they were compiled as built-in, this is fixed by supporting the new naming scheme.
--- sound/soc/tegra/tegra_alc5632.c | 1 + sound/soc/tegra/tegra_max98090.c | 1 + sound/soc/tegra/tegra_rt5640.c | 1 + sound/soc/tegra/tegra_rt5677.c | 1 + sound/soc/tegra/tegra_sgtl5000.c | 1 + sound/soc/tegra/tegra_wm8753.c | 1 + sound/soc/tegra/tegra_wm8903.c | 1 + sound/soc/tegra/tegra_wm9712.c | 1 + sound/soc/tegra/trimslice.c | 1 + 9 files changed, 9 insertions(+)
sound/soc/tegra/tegra_alc5632.c +1 -0
@@ -137,6 +137,7 @@ static struct snd_soc_dai_link tegra_alcstatic struct snd_soc_card snd_soc_tegra_alc5632 = { .name ="tegra-alc5632" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_alc5632_dai, .num_links =1 ,
sound/soc/tegra/tegra_max98090.c +1 -0
@@ -188,6 +188,7 @@ static struct snd_soc_dai_link tegra_maxstatic struct snd_soc_card snd_soc_tegra_max98090 = { .name ="tegra-max98090" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_max98090_dai, .num_links =1 ,
sound/soc/tegra/tegra_rt5640.c +1 -0
@@ -138,6 +138,7 @@ static struct snd_soc_dai_link tegra_rt5static struct snd_soc_card snd_soc_tegra_rt5640 = { .name ="tegra-rt5640" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_rt5640_dai, .num_links =1 ,
sound/soc/tegra/tegra_rt5677.c +1 -0
@@ -181,6 +181,7 @@ static struct snd_soc_dai_link tegra_rt5static struct snd_soc_card snd_soc_tegra_rt5677 = { .name ="tegra-rt5677" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_rt5677_dai, .num_links =1 ,
sound/soc/tegra/tegra_sgtl5000.c +1 -0
@@ -103,6 +103,7 @@ static struct snd_soc_dai_link tegra_sgtstatic struct snd_soc_card snd_soc_tegra_sgtl5000 = { .name ="tegra-sgtl5000" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_sgtl5000_dai, .num_links =1 ,
sound/soc/tegra/tegra_wm8753.c +1 -0
@@ -110,6 +110,7 @@ static struct snd_soc_dai_link tegra_wm8static struct snd_soc_card snd_soc_tegra_wm8753 = { .name ="tegra-wm8753" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_wm8753_dai, .num_links =1 ,
sound/soc/tegra/tegra_wm8903.c +1 -0
@@ -226,6 +226,7 @@ static struct snd_soc_dai_link tegra_wm8static struct snd_soc_card snd_soc_tegra_wm8903 = { .name ="tegra-wm8903" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_wm8903_dai, .num_links =1 ,
sound/soc/tegra/tegra_wm9712.c +1 -0
@@ -59,6 +59,7 @@ static struct snd_soc_dai_link tegra_wm9static struct snd_soc_card snd_soc_tegra_wm9712 = { .name ="tegra-wm9712" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_wm9712_dai, .num_links =1 ,
sound/soc/tegra/trimslice.c +1 -0
@@ -103,6 +103,7 @@ static struct snd_soc_dai_link trimslicestatic struct snd_soc_card snd_soc_trimslice = { .name ="tegra-trimslice" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &trimslice_tlv320aic23_dai, .num_links =1 ,
Greg Kroah-Hartman
maintainerPATCH 297/421 qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit fca41af18e10318e4de090db47d9fa7169e1bf2f upstream.
fw_cfg_showrev() is called by an indirect call in kobj_attr_show(), which violates clang's CFI checking because fw_cfg_showrev()'s second parameter is 'struct attribute', whereas the ->show() member of 'struct kobj_structure' expects the second parameter to be of type 'struct kobj_attribute'.
$ cat /sys/firmware/qemu_fw_cfg/rev 3
$ dmesg | grep "CFI failure" [ 26.016832] CFI failure (target: fw_cfg_showrev+0x0/0x8):
Fix this by converting fw_cfg_rev_attr to 'struct kobj_attribute' where this would have been caught automatically by the incompatible pointer types compiler warning. Update fw_cfg_showrev() accordingly.
--- drivers/firmware/qemu_fw_cfg.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/firmware/qemu_fw_cfg.c +3 -5
@@ -296,15 +296,13 @@ static int fw_cfg_do_platform_probe(strureturn 0 ; } -static ssize_t fw_cfg_showrev (struct kobject *k,struct attribute *a,char *buf) +static ssize_t fw_cfg_showrev (struct kobject *k,struct kobj_attribute *a, +char *buf) {return sprintf (buf,"%u\n" , fw_cfg_rev); } -static const struct { -struct attribute attr; -ssize_t (*show)(struct kobject *k,struct attribute *a,char *buf); -} fw_cfg_rev_attr = { +static const struct kobj_attribute fw_cfg_rev_attr = { .attr = { .name ="rev" , .mode =S_IRUSR }, .show = fw_cfg_showrev, };
Greg Kroah-Hartman
maintainerPATCH 298/421 ipmi/watchdog: Stop watchdog timer when the current action is none
In reply to Greg Kroah-HartmanFrom: Petr Pavlu <[email protected]>
commit 2253042d86f57d90a621ac2513a7a7a13afcf809 upstream.
When an IPMI watchdog timer is being stopped in ipmi_close() or ipmi_ioctl(WDIOS_DISABLECARD), the current watchdog action is updated to WDOG_TIMEOUT_NONE and _ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB) is called to install this action. The latter function ends up invoking __ipmi_set_timeout() which makes the actual 'Set Watchdog Timer' IPMI request.
For IPMI 1.0, this operation results in fully stopping the watchdog timer. For IPMI >= 1.5, function __ipmi_set_timeout() always specifies the "don't stop" flag in the prepared 'Set Watchdog Timer' IPMI request. This causes that the watchdog timer has its action correctly updated to 'none' but the timer continues to run. A problem is that IPMI firmware can then still log an expiration event when the configured timeout is reached, which is unexpected because the watchdog timer was requested to be stopped.
The patch fixes this problem by not setting the "don't stop" flag in __ipmi_set_timeout() when the current action is WDOG_TIMEOUT_NONE which results in stopping the watchdog timer. This makes the behaviour for IPMI >= 1.5 consistent with IPMI 1.0. It also matches the logic in __ipmi_heartbeat() which does not allow to reset the watchdog if the current action is WDOG_TIMEOUT_NONE as that would start the timer.
Message-Id: <[email protected]>
--- drivers/char/ipmi/ipmi_watchdog.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/char/ipmi/ipmi_watchdog.c +12 -10
@@ -366,16 +366,18 @@ static int __ipmi_set_timeout(struct ipm data[0 ] =0 ;WDOG_SET_TIMER_USE (data[0 ],WDOG_TIMER_USE_SMS_OS ); -if ((ipmi_version_major >1 ) - || ((ipmi_version_major ==1 ) && (ipmi_version_minor >=5 ))) { -/* This is an IPMI 1.5-only feature. */ - data[0 ] |=WDOG_DONT_STOP_ON_SET ; - }else if (ipmi_watchdog_state !=WDOG_TIMEOUT_NONE ) { -/* -* In ipmi 1.0, setting the timer stops the watchdog, we -* need to start it back up again. -*/ - hbnow =1 ; +if (ipmi_watchdog_state !=WDOG_TIMEOUT_NONE ) { +if ((ipmi_version_major >1 ) || + ((ipmi_version_major ==1 ) && (ipmi_version_minor >=5 ))) { +/* This is an IPMI 1.5-only feature. */ + data[0 ] |=WDOG_DONT_STOP_ON_SET ; + }else { +/* +* In ipmi 1.0, setting the timer stops the watchdog, we +* need to start it back up again. +*/ + hbnow =1 ; + } } data[1 ] =0 ;
Greg Kroah-Hartman
maintainerPATCH 299/421 power: supply: ab8500: Fix an old bug
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
commit f1c74a6c07e76fcb31a4bcc1f437c4361a2674ce upstream.
Trying to get the AB8500 charging driver working I ran into a bit of bitrot: we haven't used the driver for a while so errors in refactorings won't be noticed.
This one is pretty self evident: use argument to the macro or we end up with a random pointer to something else.
--- include/linux/mfd/abx500/ux500_chargalg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mfd/abx500/ux500_chargalg.h +1 -1
@@ -15,7 +15,7 @@* - POWER_SUPPLY_TYPE_USB, * because only them store as drv_data pointer to struct ux500_charger. */ -#define psy_to_ux500_charger (x) power_supply_get_drvdata(psy) +#define psy_to_ux500_charger (x) power_supply_get_drvdata(x)/* Forward declaration */ struct ux500_charger ;
Greg Kroah-Hartman
maintainerPATCH 300/421 seq_buf: Fix overflow in seq_buf_putmem_hex()
In reply to Greg Kroah-HartmanFrom: Yun Zhou <[email protected]>
commit d3b16034a24a112bb83aeb669ac5b9b01f744bb7 upstream.
There's two variables being increased in that loop (i and j), and i follows the raw data, and j follows what is being written into the buffer. We should compare 'i' to MAX_MEMHEX_BYTES or compare 'j' to HEX_CHARS. Otherwise, if 'j' goes bigger than HEX_CHARS, it will overflow the destination buffer.
--- lib/seq_buf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/seq_buf.c +3 -1
@@ -228,8 +228,10 @@ int seq_buf_putmem_hex(struct seq_buf *sWARN_ON (s->size ==0 ); +BUILD_BUG_ON (MAX_MEMHEX_BYTES *2 >=HEX_CHARS ); +while (len) { - start_len =min (len,HEX_CHARS -1 ); + start_len =min (len,MAX_MEMHEX_BYTES );#ifdef __BIG_ENDIANfor (i =0 , j =0 ; i < start_len; i++) {#else
Greg Kroah-Hartman
maintainerPATCH 301/421 tracing: Simplify & fix saved_tgids logic
In reply to Greg Kroah-HartmanFrom: Paul Burton <[email protected]>
commit b81b3e959adb107cd5b36c7dc5ba1364bbd31eb2 upstream.
The tgid_map array records a mapping from pid to tgid, where the index of an entry within the array is the pid & the value stored at that index is the tgid.
The saved_tgids_next() function iterates over pointers into the tgid_map array & dereferences the pointers which results in the tgid, but then it passes that dereferenced value to trace_find_tgid() which treats it as a pid & does a further lookup within the tgid_map array. It seems likely that the intent here was to skip over entries in tgid_map for which the recorded tgid is zero, but instead we end up skipping over entries for which the thread group leader hasn't yet had its own tgid recorded in tgid_map.
A minimal fix would be to remove the call to trace_find_tgid, turning:
if (trace_find_tgid(*ptr))
into:
if (*ptr)
..but it seems like this logic can be much simpler if we simply let seq_read() iterate over the whole tgid_map array & filter out empty entries by returning SEQ_SKIP from saved_tgids_show(). Here we take that approach, removing the incorrect logic here entirely.
--- kernel/trace/trace.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-)
kernel/trace/trace.c +13 -25
@@ -4752,37 +4752,20 @@ static const struct file_operations tracstatic void *saved_tgids_next (struct seq_file *m,void *v,loff_t *pos) { -int *ptr = v; +int pid = ++(*pos); -if (*pos || m->count) - ptr++; - - (*pos)++; - -for (; ptr <= &tgid_map[PID_MAX_DEFAULT ]; ptr++) { -if (trace_find_tgid (*ptr)) -return ptr; - } +if (pid >PID_MAX_DEFAULT ) +return NULL ; -return NULL ; +return &tgid_map[pid]; }static void *saved_tgids_start (struct seq_file *m,loff_t *pos) { -void *v; -loff_t l =0 ; - -if (!tgid_map) +if (!tgid_map || *pos >PID_MAX_DEFAULT )return NULL ; - v = &tgid_map[0 ]; -while (l <= *pos) { - v =saved_tgids_next (m, v, &l); -if (!v) -return NULL ; - } - -return v; +return &tgid_map[*pos]; }static void saved_tgids_stop (struct seq_file *m,void *v)
@@ -4791,9 +4774,14 @@ static void saved_tgids_stop(struct seq_static int saved_tgids_show (struct seq_file *m,void *v) { -int pid = (int *)v - tgid_map; +int *entry = (int *)v; +int pid = entry - tgid_map; +int tgid = *entry; + +if (tgid ==0 ) +return SEQ_SKIP ; -seq_printf (m,"%d %d\n" , pid,trace_find_tgid (pid)); +seq_printf (m,"%d %d\n" , pid, tgid);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 302/421 tracing: Resize tgid_map to pid_max, not PID_MAX_DEFAULT
In reply to Greg Kroah-HartmanFrom: Paul Burton <[email protected]>
commit 4030a6e6a6a4a42ff8c18414c9e0c93e24cc70b8 upstream.
Currently tgid_map is sized at PID_MAX_DEFAULT entries, which means that on systems where pid_max is configured higher than PID_MAX_DEFAULT the ftrace record-tgid option doesn't work so well. Any tasks with PIDs higher than PID_MAX_DEFAULT are simply not recorded in tgid_map, and don't show up in the saved_tgids file.
In particular since systemd v243 & above configure pid_max to its highest possible 1<<22 value by default on 64 bit systems this renders the record-tgids option of little use.
Increase the size of tgid_map to the configured pid_max instead, allowing it to cover the full range of PIDs up to the maximum value of PID_MAX_LIMIT if the system is configured that way.
On 64 bit systems with pid_max == PID_MAX_LIMIT this will increase the size of tgid_map from 256KiB to 16MiB. Whilst this 64x increase in memory overhead sounds significant 64 bit systems are presumably best placed to accommodate it, and since tgid_map is only allocated when the record-tgid option is actually used presumably the user would rather it spends sufficient memory to actually record the tgids they expect.
The size of tgid_map could also increase for CONFIG_BASE_SMALL=y configurations, but these seem unlikely to be systems upon which people are both configuring a large pid_max and running ftrace with record-tgid anyway.
Of note is that we only allocate tgid_map once, the first time that the record-tgid option is enabled. Therefore its size is only set once, to the value of pid_max at the time the record-tgid option is first enabled. If a user increases pid_max after that point, the saved_tgids file will not contain entries for any tasks with pids beyond the earlier value of pid_max.
--- kernel/trace/trace.c | 63 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 16 deletions(-)
kernel/trace/trace.c +47 -16
@@ -1729,8 +1729,15 @@ void tracing_reset_all_online_cpus(void) } } +/* +* The tgid_map array maps from pid to tgid; i.e. the value stored at index i +* is the tgid last observed corresponding to pid=i. +*/ static int *tgid_map; +/* The maximum valid index into tgid_map. */ +static size_t tgid_map_max; +#define SAVED_CMDLINES_DEFAULT 128#define NO_CMDLINE_MAP UINT_MAXstatic arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED;
@@ -2003,24 +2010,41 @@ void trace_find_cmdline(int pid, char copreempt_enable (); } +static int *trace_find_tgid_ptr (int pid) +{ +/* +* Pairs with the smp_store_release in set_tracer_flag() to ensure that +* if we observe a non-NULL tgid_map then we also observe the correct +* tgid_map_max. +*/ +int *map =smp_load_acquire (&tgid_map); + +if (unlikely (!map || pid > tgid_map_max)) +return NULL ; + +return &map[pid]; +} +int trace_find_tgid (int pid) { -if (unlikely (!tgid_map || !pid || pid >PID_MAX_DEFAULT )) -return 0 ; +int *ptr =trace_find_tgid_ptr (pid); -return tgid_map[pid]; +return ptr ? *ptr :0 ; }static int trace_save_tgid (struct task_struct *tsk) { +int *ptr; +/* treat recording of idle task as a success */ if (!tsk->pid)return 1 ; -if (unlikely (!tgid_map || tsk->pid >PID_MAX_DEFAULT )) + ptr =trace_find_tgid_ptr (tsk->pid); +if (!ptr)return 0 ; - tgid_map[tsk->pid] = tsk->tgid; + *ptr = tsk->tgid;return 1 ; }
@@ -4355,6 +4379,8 @@ int trace_keep_overwrite(struct tracer *int set_tracer_flag (struct trace_array *tr,unsigned int mask,int enabled) { +int *map; +if ((mask ==TRACE_ITER_RECORD_TGID ) || (mask ==TRACE_ITER_RECORD_CMD ))lockdep_assert_held (&event_mutex);
@@ -4377,10 +4403,19 @@ int set_tracer_flag(struct trace_array *trace_event_enable_cmd_record (enabled);if (mask ==TRACE_ITER_RECORD_TGID ) { -if (!tgid_map) - tgid_map =kvcalloc (PID_MAX_DEFAULT +1 , -sizeof (*tgid_map), -GFP_KERNEL ); +if (!tgid_map) { + tgid_map_max = pid_max; + map =kvcalloc (tgid_map_max +1 ,sizeof (*tgid_map), +GFP_KERNEL ); + +/* +* Pairs with smp_load_acquire() in +* trace_find_tgid_ptr() to ensure that if it observes +* the tgid_map we just allocated then it also observes +* the corresponding tgid_map_max value. +*/ +smp_store_release (&tgid_map, map); + }if (!tgid_map) { tr->trace_flags &= ~TRACE_ITER_RECORD_TGID ;return -ENOMEM ;
@@ -4754,18 +4789,14 @@ static void *saved_tgids_next(struct seq {int pid = ++(*pos); -if (pid >PID_MAX_DEFAULT ) -return NULL ; - -return &tgid_map[pid]; +return trace_find_tgid_ptr (pid); }static void *saved_tgids_start (struct seq_file *m,loff_t *pos) { -if (!tgid_map || *pos >PID_MAX_DEFAULT ) -return NULL ; +int pid = *pos; -return &tgid_map[*pos]; +return trace_find_tgid_ptr (pid); }static void saved_tgids_stop (struct seq_file *m,void *v)
Greg Kroah-Hartman
maintainerPATCH 303/421 ipack/carriers/tpci200: Fix a double free in tpci200_pci_probe
In reply to Greg Kroah-HartmanFrom: Lv Yunlong <[email protected]>
commit 9272e5d0028d45a3b45b58c9255e6e0df53f7ad9 upstream.
In the out_err_bus_register error branch of tpci200_pci_probe, tpci200->info->cfg_regs is freed by tpci200_uninstall()-> tpci200_unregister()->pci_iounmap(..,tpci200->info->cfg_regs) in the first time.
But later, iounmap() is called to free tpci200->info->cfg_regs again.
My patch sets tpci200->info->cfg_regs to NULL after tpci200_uninstall() to avoid the double free.
--- drivers/ipack/carriers/tpci200.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ipack/carriers/tpci200.c +4 -1
@@ -599,8 +599,11 @@ static int tpci200_pci_probe(struct pci_ out_err_bus_register:tpci200_uninstall (tpci200); +/* tpci200->info->cfg_regs is unmapped in tpci200_uninstall */ + tpci200->info->cfg_regs =NULL ; out_err_install: -iounmap (tpci200->info->cfg_regs); +if (tpci200->info->cfg_regs) +iounmap (tpci200->info->cfg_regs); out_err_ioremap:pci_release_region (pdev,TPCI200_CFG_MEM_BAR ); out_err_pci_request:
Greg Kroah-Hartman
maintainerPATCH 304/421 coresight: tmc-etf: Fix global-out-of-bounds in tmc_update_etf_buffer()
In reply to Greg Kroah-HartmanFrom: Sai Prakash Ranjan <[email protected]>
commit 5fae8a946ac2df879caf3f79a193d4766d00239b upstream.
commit 6f755e85c332 ("coresight: Add helper for inserting synchronization packets") removed trailing '\0' from barrier_pkt array and updated the call sites like etb_update_buffer() to have proper checks for barrier_pkt size before read but missed updating tmc_update_etf_buffer() which still reads barrier_pkt past the array size resulting in KASAN out-of-bounds bug. Fix this by adding a check for barrier_pkt size before accessing like it is done in etb_update_buffer().
BUG: KASAN: global-out-of-bounds in tmc_update_etf_buffer+0x4b8/0x698
Read of size 4 at addr ffffffd05b7d1030 by task perf/2629
Call trace:
dump_backtrace+0x0/0x27c
show_stack+0x20/0x2c
dump_stack+0x11c/0x188
print_address_description+0x3c/0x4a4
__kasan_report+0x140/0x164
kasan_report+0x10/0x18
__asan_report_load4_noabort+0x1c/0x24
tmc_update_etf_buffer+0x4b8/0x698
etm_event_stop+0x248/0x2d8
etm_event_del+0x20/0x2c
event_sched_out+0x214/0x6f0
group_sched_out+0xd0/0x270
ctx_sched_out+0x2ec/0x518
__perf_event_task_sched_out+0x4fc/0xe6c
__schedule+0x1094/0x16a0
preempt_schedule_irq+0x88/0x170
arm64_preempt_schedule_irq+0xf0/0x18c
el1_irq+0xe8/0x180
perf_event_exec+0x4d8/0x56c
setup_new_exec+0x204/0x400
load_elf_binary+0x72c/0x18c0
search_binary_handler+0x13c/0x420
load_script+0x500/0x6c4
search_binary_handler+0x13c/0x420
exec_binprm+0x118/0x654
__do_execve_file+0x77c/0xba4
__arm64_compat_sys_execve+0x98/0xac
el0_svc_common+0x1f8/0x5e0
el0_svc_compat_handler+0x84/0xb0
el0_svc_compat+0x10/0x50
The buggy address belongs to the variable:
barrier_pkt+0x10/0x40
Memory state around the buggy address:
ffffffd05b7d0f00: fa fa fa fa 04 fa fa fa fa fa fa fa 00 00 00 00
ffffffd05b7d0f80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffffffd05b7d1000: 00 00 00 00 00 00 fa fa fa fa fa fa 00 00 00 03
^
ffffffd05b7d1080: fa fa fa fa 00 02 fa fa fa fa fa fa 03 fa fa fa
ffffffd05b7d1100: fa fa fa fa 00 00 00 00 05 fa fa fa fa fa fa fa
==================================================================--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-tmc-etf.c +1 -1
@@ -470,7 +470,7 @@ static void tmc_update_etf_buffer(struct buf_ptr = buf->data_pages[cur] + offset; *buf_ptr =readl_relaxed (drvdata->base +TMC_RRD ); -if (lost && *barrier) { +if (lost && i <CORESIGHT_BARRIER_PKT_SIZE ) { *buf_ptr = *barrier; barrier++; }
Greg Kroah-Hartman
maintainerPATCH 305/421 dm btree remove: assign new_root only when removal succeeds
In reply to Greg Kroah-HartmanFrom: Hou Tao <[email protected]>
commit b6e58b5466b2959f83034bead2e2e1395cca8aeb upstream.
remove_raw() in dm_btree_remove() may fail due to IO read error (e.g. read the content of origin block fails during shadowing), and the value of shadow_spine::root is uninitialized, but the uninitialized value is still assign to new_root in the end of dm_btree_remove().
For dm-thin, the value of pmd->details_root or pmd->root will become an uninitialized value, so if trying to read details_info tree again out-of-bound memory may occur as showed below:
general protection fault, probably for non-canonical address 0x3fdcb14c8d7520 CPU: 4 PID: 515 Comm: dmsetup Not tainted 5.13.0-rc6 Hardware name: QEMU Standard PC RIP: 0010:metadata_ll_load_ie+0x14/0x30 Call Trace: sm_metadata_count_is_more_than_one+0xb9/0xe0 dm_tm_shadow_block+0x52/0x1c0 shadow_step+0x59/0xf0 remove_raw+0xb2/0x170 dm_btree_remove+0xf4/0x1c0 dm_pool_delete_thin_device+0xc3/0x140 pool_message+0x218/0x2b0 target_message+0x251/0x290 ctl_ioctl+0x1c4/0x4d0 dm_ctl_ioctl+0xe/0x20 __x64_sys_ioctl+0x7b/0xb0 do_syscall_64+0x40/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae
Fixing it by only assign new_root when removal succeeds
--- drivers/md/persistent-data/dm-btree-remove.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/persistent-data/dm-btree-remove.c +2 -1
@@ -549,7 +549,8 @@ int dm_btree_remove(struct dm_btree_infodelete_at (n, index); } - *new_root =shadow_root (&spine); +if (!r) + *new_root =shadow_root (&spine);exit_shadow_spine (&spine);return r;
Greg Kroah-Hartman
maintainerPATCH 306/421 PCI: Leave Apple Thunderbolt controllers on for s2idle or standby
In reply to Greg Kroah-HartmanFrom: Konstantin Kharlamov <[email protected]>
commit 4694ae373dc2114f9a82f6ae15737e65af0c6dea upstream.
On Macbook 2013, resuming from suspend-to-idle or standby resulted in the external monitor no longer being detected, a stacktrace, and errors like this in dmesg:
pcieport 0000:06:00.0: can't change power state from D3hot to D0 (config space inaccessible)
The reason is that we know how to turn power to the Thunderbolt controller *off* via the SXIO/SXFP/SXLF methods, but we don't know how to turn power back on. We have to rely on firmware to turn the power back on.
When going to the "suspend-to-idle" or "standby" system sleep states, firmware is not involved either on the suspend side or the resume side, so we can't use SXIO/SXFP/SXLF to turn the power off.
Skip SXIO/SXFP/SXLF when firmware isn't involved in suspend, e.g., when we're going to the "suspend-to-idle" or "standby" system sleep states.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212767
--- drivers/pci/quirks.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/pci/quirks.c +11 -0
@@ -28,6 +28,7 @@#include <linux/nvme.h> #include <linux/platform_data/x86/apple.h> #include <linux/pm_runtime.h> +#include <linux/suspend.h> #include <linux/switchtec.h> #include <asm/dma.h> /* isa_dma_bridge_buggy */ #include "pci.h"
@@ -3573,6 +3574,16 @@ static void quirk_apple_poweroff_thunderreturn ;if (pci_pcie_type (dev) !=PCI_EXP_TYPE_UPSTREAM )return ; + +/* +* SXIO/SXFP/SXLF turns off power to the Thunderbolt controller. +* We don't know how to turn it back on again, but firmware does, +* so we can only use SXIO/SXFP/SXLF if we're suspending via +* firmware. +*/ +if (!pm_suspend_via_firmware ()) +return ; + bridge =ACPI_HANDLE (&dev->dev);if (!bridge)return ;
Greg Kroah-Hartman
maintainerPATCH 307/421 PCI: aardvark: Fix checking for PIO Non-posted Request
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 8ceeac307a79f68c0d0c72d6e48b82fa424204ec upstream.
PIO_NON_POSTED_REQ for PIO_STAT register is incorrectly defined. Bit 10 in register PIO_STAT indicates the response is to a non-posted request.
--- drivers/pci/controller/pci-aardvark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pci-aardvark.c +1 -1
@@ -54,7 +54,7 @@#define PIO_COMPLETION_STATUS_UR 1#define PIO_COMPLETION_STATUS_CRS 2#define PIO_COMPLETION_STATUS_CA 4 -#define PIO_NON_POSTED_REQ BIT(0) +#define PIO_NON_POSTED_REQ BIT(10)#define PIO_ADDR_LS (PIO_BASE_ADDR + 0x8)#define PIO_ADDR_MS (PIO_BASE_ADDR + 0xc)#define PIO_WR_DATA (PIO_BASE_ADDR + 0x10)
Greg Kroah-Hartman
maintainerPATCH 308/421 media: subdev: disallow ioctl for saa6588/davinci
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 0a7790be182d32b9b332a37cb4206e24fe94b728 upstream.
The saa6588_ioctl() function expects to get called from other kernel functions with a 'saa6588_command' pointer, but I found nothing stops it from getting called from user space instead, which seems rather dangerous.
The same thing happens in the davinci vpbe driver with its VENC_GET_FLD command.
As a quick fix, add a separate .command() callback pointer for this driver and change the two callers over to that. This change can easily get backported to stable kernels if necessary, but since there are only two drivers, we may want to eventually replace this with a set of more specialized callbacks in the long run.
--- drivers/media/i2c/saa6588.c | 4 ++-- drivers/media/pci/bt8xx/bttv-driver.c | 6 +++--- drivers/media/pci/saa7134/saa7134-video.c | 6 +++--- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/davinci/vpbe_venc.c | 6 ++---- include/media/v4l2-subdev.h | 4 ++++ 6 files changed, 15 insertions(+), 13 deletions(-)
drivers/media/i2c/saa6588.c +2 -2
@@ -392,7 +392,7 @@ static void saa6588_configure(struct saa/* ---------------------------------------------------------------------- */ -static long saa6588_ioctl (struct v4l2_subdev *sd,unsigned int cmd,void *arg) +static long saa6588_command (struct v4l2_subdev *sd,unsigned int cmd,void *arg) {struct saa6588 *s =to_saa6588 (sd);struct saa6588_command *a = arg;
@@ -445,7 +445,7 @@ static int saa6588_s_tuner(struct v4l2_s/* ----------------------------------------------------------------------- */ static const struct v4l2_subdev_core_ops saa6588_core_ops = { - .ioctl = saa6588_ioctl, + .command = saa6588_command, };static const struct v4l2_subdev_tuner_ops saa6588_tuner_ops = {
drivers/media/pci/bt8xx/bttv-driver.c +3 -3
@@ -3243,7 +3243,7 @@ static int radio_release(struct file *fi btv->radio_user--; -bttv_call_all (btv, core, ioctl,SAA6588_CMD_CLOSE , &cmd); +bttv_call_all (btv, core, command,SAA6588_CMD_CLOSE , &cmd);if (btv->radio_user ==0 ) btv->has_radio_tuner =0 ;
@@ -3324,7 +3324,7 @@ static ssize_t radio_read(struct file *f cmd.result = -ENODEV ;radio_enable (btv); -bttv_call_all (btv, core, ioctl,SAA6588_CMD_READ , &cmd); +bttv_call_all (btv, core, command,SAA6588_CMD_READ , &cmd);return cmd.result; }
@@ -3345,7 +3345,7 @@ static __poll_t radio_poll(struct file * cmd.instance = file; cmd.event_list = wait; cmd.poll_mask = res; -bttv_call_all (btv, core, ioctl,SAA6588_CMD_POLL , &cmd); +bttv_call_all (btv, core, command,SAA6588_CMD_POLL , &cmd);return cmd.poll_mask; }
drivers/media/pci/saa7134/saa7134-video.c +3 -3
@@ -1202,7 +1202,7 @@ static int video_release(struct file *fisaa_call_all (dev, tuner, standby);if (vdev->vfl_type ==VFL_TYPE_RADIO ) -saa_call_all (dev, core, ioctl,SAA6588_CMD_CLOSE , &cmd); +saa_call_all (dev, core, command,SAA6588_CMD_CLOSE , &cmd);mutex_unlock (&dev->lock);return 0 ;
@@ -1221,7 +1221,7 @@ static ssize_t radio_read(struct file *f cmd.result = -ENODEV ;mutex_lock (&dev->lock); -saa_call_all (dev, core, ioctl,SAA6588_CMD_READ , &cmd); +saa_call_all (dev, core, command,SAA6588_CMD_READ , &cmd);mutex_unlock (&dev->lock);return cmd.result;
@@ -1237,7 +1237,7 @@ static __poll_t radio_poll(struct file * cmd.event_list = wait; cmd.poll_mask =0 ;mutex_lock (&dev->lock); -saa_call_all (dev, core, ioctl,SAA6588_CMD_POLL , &cmd); +saa_call_all (dev, core, command,SAA6588_CMD_POLL , &cmd);mutex_unlock (&dev->lock);return rc | cmd.poll_mask;
drivers/media/platform/davinci/vpbe_display.c +1 -1
@@ -60,7 +60,7 @@ static int venc_is_second_field(struct v ret =v4l2_subdev_call (vpbe_dev->venc, core, - ioctl, + command,VENC_GET_FLD , &val);if (ret <0 ) {
drivers/media/platform/davinci/vpbe_venc.c +2 -4
@@ -534,9 +534,7 @@ static int venc_s_routing(struct v4l2_sureturn ret; } -static long venc_ioctl (struct v4l2_subdev *sd, -unsigned int cmd, -void *arg) +static long venc_command (struct v4l2_subdev *sd,unsigned int cmd,void *arg) {u32 val;
@@ -555,7 +553,7 @@ static long venc_ioctl(struct v4l2_subde }static const struct v4l2_subdev_core_ops venc_core_ops = { - .ioctl = venc_ioctl, + .command = venc_command, };static const struct v4l2_subdev_video_ops venc_video_ops = {
include/media/v4l2-subdev.h +4 -0
@@ -171,6 +171,9 @@ struct v4l2_subdev_io_pin_config {* @s_gpio: set GPIO pins. Very simple right now, might need to be extended with * a direction argument if needed. * +* @command: called by in-kernel drivers in order to call functions internal +* to subdev drivers driver that have a separate callback. +* * @ioctl: called at the end of ioctl() syscall handler at the V4L2 core. * used to provide support for private ioctls used on the driver. *
@@ -202,6 +205,7 @@ struct v4l2_subdev_core_ops {int (*load_fw)(struct v4l2_subdev *sd);int (*reset)(struct v4l2_subdev *sd,u32 val);int (*s_gpio)(struct v4l2_subdev *sd,u32 val); +long (*command)(struct v4l2_subdev *sd,unsigned int cmd,void *arg);long (*ioctl)(struct v4l2_subdev *sd,unsigned int cmd,void *arg);#ifdef CONFIG_COMPAT long (*compat_ioctl32)(struct v4l2_subdev *sd, unsigned int cmd,
Greg Kroah-Hartman
maintainerPATCH 309/421 media: dtv5100: fix control-request directions
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 8c8b9a9be2afa8bd6a72ad1130532baab9fab89d upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Fix the control requests which erroneously used usb_rcvctrlpipe().
--- drivers/media/usb/dvb-usb/dtv5100.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/usb/dvb-usb/dtv5100.c +5 -2
@@ -35,6 +35,7 @@ static int dtv5100_i2c_msg(struct dvb_us u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen) { struct dtv5100_state *st = d->priv; +unsigned int pipe;u8 request;u8 type;u16 value;
@@ -43,6 +44,7 @@ static int dtv5100_i2c_msg(struct dvb_usswitch (wlen) {case 1 :/* write { reg }, read { value } */ + pipe =usb_rcvctrlpipe (d->udev,0 ); request = (addr ==DTV5100_DEMOD_ADDR ?DTV5100_DEMOD_READ :DTV5100_TUNER_READ ); type =USB_TYPE_VENDOR |USB_DIR_IN ;
@@ -50,6 +52,7 @@ static int dtv5100_i2c_msg(struct dvb_usbreak ;case 2 :/* write { reg, value } */ + pipe =usb_sndctrlpipe (d->udev,0 ); request = (addr ==DTV5100_DEMOD_ADDR ?DTV5100_DEMOD_WRITE :DTV5100_TUNER_WRITE ); type =USB_TYPE_VENDOR |USB_DIR_OUT ;
@@ -63,7 +66,7 @@ static int dtv5100_i2c_msg(struct dvb_usmemcpy (st->data, rbuf, rlen);msleep (1 );/* avoid I2C errors */ -return usb_control_msg (d->udev,usb_rcvctrlpipe (d->udev,0 ), request, +return usb_control_msg (d->udev, pipe, request, type, value, index, st->data, rlen,DTV5100_USB_TIMEOUT ); }
@@ -150,7 +153,7 @@ static int dtv5100_probe(struct usb_inte/* initialize non qt1010/zl10353 part? */ for (i =0 ; dtv5100_init[i].request; i++) { - ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), + ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), dtv5100_init[i].request, USB_TYPE_VENDOR | USB_DIR_OUT, dtv5100_init[i].value,
Greg Kroah-Hartman
maintainerPATCH 310/421 media: zr364xx: fix memory leak in zr364xx_start_readpipe
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit 0a045eac8d0427b64577a24d74bb8347c905ac65 upstream.
syzbot reported memory leak in zr364xx driver.
The problem was in non-freed urb in case ofusb_submit_urb() fail.
backtrace:
[<ffffffff82baedf6>] kmalloc include/linux/slab.h:561 [inline] [<ffffffff82baedf6>] usb_alloc_urb+0x66/0xe0 drivers/usb/core/urb.c:74 [<ffffffff82f7cce8>] zr364xx_start_readpipe+0x78/0x130 drivers/media/usb/zr364xx/zr364xx.c:1022 [<ffffffff84251dfc>] zr364xx_board_init drivers/media/usb/zr364xx/zr364xx.c:1383 [inline] [<ffffffff84251dfc>] zr364xx_probe+0x6a3/0x851 drivers/media/usb/zr364xx/zr364xx.c:1516 [<ffffffff82bb6507>] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 [<ffffffff826018a9>] really_probe+0x159/0x500 drivers/base/dd.c:576
--- drivers/media/usb/zr364xx/zr364xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/usb/zr364xx/zr364xx.c +1 -0
@@ -1058,6 +1058,7 @@ static int zr364xx_start_readpipe(structDBG ("submitting URB %p\n" , pipe_info->stream_urb); retval =usb_submit_urb (pipe_info->stream_urb,GFP_KERNEL );if (retval) { +usb_free_urb (pipe_info->stream_urb); printk(KERN_ERR KBUILD_MODNAME ": start read pipe failed\n");return retval; }
Greg Kroah-Hartman
maintainerPATCH 311/421 media: gspca/sq905: fix control-request direction
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 53ae298fde7adcc4b1432bce2dbdf8dac54dfa72 upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Fix the USB_REQ_SYNCH_FRAME request which erroneously used usb_sndctrlpipe().
--- drivers/media/usb/gspca/sq905.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/gspca/sq905.c +1 -1
@@ -125,7 +125,7 @@ static int sq905_command(struct gspca_de } ret = usb_control_msg(gspca_dev->dev, - usb_sndctrlpipe(gspca_dev->dev, 0), + usb_rcvctrlpipe(gspca_dev->dev, 0), USB_REQ_SYNCH_FRAME, /* request */ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, SQ905_PING, 0, gspca_dev->usb_buf, 1,
Greg Kroah-Hartman
maintainerPATCH 312/421 media: gspca/sunplus: fix zero-length control requests
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit b4bb4d425b7b02424afea2dfdcd77b3b4794175e upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
Fix the single zero-length control request which was using the read-register helper, and update the helper so that zero-length reads fail with an error message instead.
--- drivers/media/usb/gspca/sunplus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/usb/gspca/sunplus.c +6 -2
@@ -251,6 +251,10 @@ static void reg_r(struct gspca_dev *gspcgspca_err (gspca_dev,"reg_r: buffer overflow\n" );return ; } +if (len ==0 ) { +gspca_err (gspca_dev,"reg_r: zero-length read\n" ); +return ; + }if (gspca_dev->usb_err <0 )return ; ret = usb_control_msg(gspca_dev->dev,
@@ -259,7 +263,7 @@ static void reg_r(struct gspca_dev *gspcUSB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,/* value */ index, - len ? gspca_dev->usb_buf :NULL , len, + gspca_dev->usb_buf, len, 500);if (ret <0 ) {pr_err ("reg_r err %d\n" , ret);
@@ -736,7 +740,7 @@ static int sd_start(struct gspca_dev *gscase MegaImageVI:reg_w_riv (gspca_dev,0xf0 ,0 ,0 );spca504B_WaitCmdStatus (gspca_dev); -reg_r (gspca_dev,0xf0 ,4 ,0 ); +reg_w_riv (gspca_dev,0xf0 ,4 ,0 );spca504B_WaitCmdStatus (gspca_dev);break ;default :
Greg Kroah-Hartman
maintainerPATCH 313/421 media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K
In reply to Greg Kroah-HartmanFrom: Benjamin Drung <[email protected]>
commit 4c6e0976295add7f0ed94d276c04a3d6f1ea8f83 upstream.
The Elgato Cam Link 4K HDMI video capture card reports to support three different pixel formats, where the first format depends on the connected HDMI device.
``` $ v4l2-ctl -d /dev/video0 --list-formats-ext ioctl: VIDIOC_ENUM_FMT Type: Video Capture [0]: 'NV12' (Y/CbCr 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) [1]: 'NV12' (Y/CbCr 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) [2]: 'YU12' (Planar YUV 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) ```
Changing the pixel format to anything besides the first pixel format does not work:
``` $ v4l2-ctl -d /dev/video0 --try-fmt-video pixelformat=YU12 Format Video Capture: Width/Height : 3840/2160 Pixel Format : 'NV12' (Y/CbCr 4:2:0) Field : None Bytes per Line : 3840 Size Image : 12441600 Colorspace : sRGB Transfer Function : Rec. 709 YCbCr/HSV Encoding: Rec. 709 Quantization : Default (maps to Limited Range) Flags : ```
User space applications like VLC might show an error message on the terminal in that case:
``` libv4l2: error set_fmt gave us a different result than try_fmt! ```
Depending on the error handling of the user space applications, they might display a distorted video, because they use the wrong pixel format for decoding the stream.
The Elgato Cam Link 4K responds to the USB video probe VS_PROBE_CONTROL/VS_COMMIT_CONTROL with a malformed data structure: The second byte contains bFormatIndex (instead of being the second byte of bmHint). The first byte is always zero. The third byte is always 1.
The firmware bug was reported to Elgato on 2020-12-01 and it was forwarded by the support team to the developers as feature request. There is no firmware update available since then. The latest firmware for Elgato Cam Link 4K as of 2021-03-23 has MCU 20.02.19 and FPGA 67.
Therefore correct the malformed data structure for this device. The change was successfully tested with VLC, OBS, and Chromium using different pixel formats (YUYV, NV12, YU12), resolutions (3840x2160, 1920x1080), and frame rates (29.970 and 59.940 fps).
--- drivers/media/usb/uvc/uvc_video.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/media/usb/uvc/uvc_video.c +27 -0
@@ -129,10 +129,37 @@ int uvc_query_ctrl(struct uvc_device *destatic void uvc_fixup_video_ctrl (struct uvc_streaming *stream,struct uvc_streaming_control *ctrl) { +static const struct usb_device_id elgato_cam_link_4k = { +USB_DEVICE (0x0fd9 ,0x0066 ) + };struct uvc_format *format =NULL ;struct uvc_frame *frame =NULL ;unsigned int i; +/* +* The response of the Elgato Cam Link 4K is incorrect: The second byte +* contains bFormatIndex (instead of being the second byte of bmHint). +* The first byte is always zero. The third byte is always 1. +* +* The UVC 1.5 class specification defines the first five bits in the +* bmHint bitfield. The remaining bits are reserved and should be zero. +* Therefore a valid bmHint will be less than 32. +* +* Latest Elgato Cam Link 4K firmware as of 2021-03-23 needs this fix. +* MCU: 20.02.19, FPGA: 67 +*/ +if (usb_match_one_id (stream->dev->intf, &elgato_cam_link_4k) && + ctrl->bmHint >255 ) { +u8 corrected_format_index = ctrl->bmHint >>8 ; + +/* uvc_dbg(stream->dev, VIDEO, +"Correct USB video probe response from {bmHint: 0x%04x, bFormatIndex: %u} to {bmHint: 0x%04x, bFormatIndex: %u}\n", +ctrl->bmHint, ctrl->bFormatIndex, +1, corrected_format_index); */ + ctrl->bmHint =1 ; + ctrl->bFormatIndex = corrected_format_index; + } +for (i =0 ; i < stream->nformats; ++i) {if (stream->format[i].index == ctrl->bFormatIndex) { format = &stream->format[i];
Greg Kroah-Hartman
maintainerPATCH 314/421 pinctrl: mcp23s08: Fix missing unlock on error in mcp23s08_irq()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
commit 884af72c90016cfccd5717439c86b48702cbf184 upstream.
Add the missing unlock before return from function mcp23s08_irq() in the error handling case.
v1-->v2:
remove the "return IRQ_HANDLED" line
--- drivers/pinctrl/pinctrl-mcp23s08.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-mcp23s08.c +1 -1
@@ -460,7 +460,7 @@ static irqreturn_t mcp23s08_irq(int irq,if (intf ==0 ) {/* There is no interrupt pending */ -return IRQ_HANDLED ; + goto unlock; }if (mcp_read (mcp,MCP_INTCAP , &intcap))
Greg Kroah-Hartman
maintainerPATCH 315/421 jfs: fix GPF in diFree
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit 9d574f985fe33efd6911f4d752de6f485a1ea732 upstream.
Avoid passing inode with
JFS_SBI(inode->i_sb)->ipimap == NULL to
diFree()[1]. GFP will appear:
struct inode *ipimap = JFS_SBI(ip->i_sb)->ipimap; struct inomap *imap = JFS_IP(ipimap)->i_imap;
JFS_IP() will return invalid pointer when ipimap == NULL
Call Trace: diFree+0x13d/0x2dc0 fs/jfs/jfs_imap.c:853 [1] jfs_evict_inode+0x2c9/0x370 fs/jfs/inode.c:154 evict+0x2ed/0x750 fs/inode.c:578 iput_final fs/inode.c:1654 [inline] iput.part.0+0x3fe/0x820 fs/inode.c:1680 iput+0x58/0x70 fs/inode.c:1670
--- fs/jfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/jfs/inode.c +2 -1
@@ -161,7 +161,8 @@ void jfs_evict_inode(struct inode *inodeif (test_cflag (COMMIT_Freewmap, inode))jfs_free_zero_link (inode); -diFree (inode); +if (JFS_SBI (inode->i_sb)->ipimap) +diFree (inode);/* * Free the inode from the quota allocation.
Greg Kroah-Hartman
maintainerPATCH 316/421 smackfs: restrict bytes count in smk_set_cipso()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit 49ec114a6e62d8d320037ce71c1aaf9650b3cafd upstream.
Oops, I failed to update subject line.
Quoted 1 line
From
07571157c91b98ce1a4aa70967531e64b78e8346Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <[email protected]>
Date: Mon, 12 Apr 2021 22:25:06 +0900
Subject: [PATCH 4.19 316/421] smackfs: restrict bytes count in smk_set_cipso()
Commit 7ef4c19d245f3dc2 ("smackfs: restrict bytes count in smackfs write functions") missed that count > SMK_CIPSOMAX check applies to only format == SMK_FIXED24_FMT case.
--- security/smack/smackfs.c | 2 ++ 1 file changed, 2 insertions(+)
security/smack/smackfs.c +2 -0
@@ -883,6 +883,8 @@ static ssize_t smk_set_cipso(struct fileif (format ==SMK_FIXED24_FMT && (count <SMK_CIPSOMIN || count >SMK_CIPSOMAX ))return -EINVAL ; +if (count >PAGE_SIZE ) +return -EINVAL ; data =memdup_user_nul (buf, count);if (IS_ERR (data))
Greg Kroah-Hartman
maintainerPATCH 317/421 KVM: x86: Use guest MAXPHYADDR from CPUID.0x8000_0008 iff TDP is enabled
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 4bf48e3c0aafd32b960d341c4925b48f416f14a5 upstream.
Ignore the guest MAXPHYADDR reported by CPUID.0x8000_0008 if TDP, i.e. NPT, is disabled, and instead use the host's MAXPHYADDR. Per AMD'S APM:
Maximum guest physical address size in bits. This number applies only to guests using nested paging. When this field is zero, refer to the PhysAddrSize field for the maximum guest physical address size.
Message-Id: <[email protected]>
--- arch/x86/kvm/cpuid.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/kvm/cpuid.c +7 -1
@@ -666,8 +666,14 @@ static inline int __do_cpuid_ent(structunsigned virt_as =max ((entry->eax >>8 ) &0xff ,48U );unsigned phys_as = entry->eax &0xff ; -if (!g_phys_as) +/* +* Use bare metal's MAXPHADDR if the CPU doesn't report guest +* MAXPHYADDR separately, or if TDP (NPT) is disabled, as the +* guest version "applies only to guests using nested paging". +*/ +if (!g_phys_as || !tdp_enabled) g_phys_as = phys_as; + entry->eax = g_phys_as | (virt_as <<8 ); entry->edx =0 ;/*
Greg Kroah-Hartman
maintainerPATCH 318/421 KVM: X86: Disable hardware breakpoints unconditionally before kvm_x86->run()
In reply to Greg Kroah-HartmanFrom: Lai Jiangshan <[email protected]>
commit f85d40160691881a17a397c448d799dfc90987ba upstream.
When the host is using debug registers but the guest is not using them nor is the guest in guest-debug state, the kvm code does not reset the host debug registers before kvm_x86->run(). Rather, it relies on the hardware vmentry instruction to automatically reset the dr7 registers which ensures that the host breakpoints do not affect the guest.
This however violates the non-instrumentable nature around VM entry and exit; for example, when a host breakpoint is set on vcpu->arch.cr2,
Another issue is consistency. When the guest debug registers are active, the host breakpoints are reset before kvm_x86->run(). But when the guest debug registers are inactive, the host breakpoints are delayed to be disabled. The host tracing tools may see different results depending on what the guest is doing.
To fix the problems, we clear %db7 unconditionally before kvm_x86->run() if the host has set any breakpoints, no matter if the guest is using them or not.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kvm/x86.c +2 -0
@@ -7772,6 +7772,8 @@ static int vcpu_enter_guest(struct kvm_vset_debugreg (vcpu->arch.eff_db[3 ],3 );set_debugreg (vcpu->arch.dr6,6 ); vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD ; + }else if (unlikely (hw_breakpoint_active ())) { +set_debugreg (0 ,7 ); } kvm_x86_ops->run (vcpu);
Greg Kroah-Hartman
maintainerPATCH 319/421 scsi: core: Fix bad pointer dereference when ehandler kthread is invalid
In reply to Greg Kroah-HartmanFrom: Tyrel Datwyler <[email protected]>
commit 93aa71ad7379900e61c8adff6a710a4c18c7c99b upstream.
Commit 66a834d09293 ("scsi: core: Fix error handling of scsi_host_alloc()") changed the allocation logic to call put_device() to perform host cleanup with the assumption that IDA removal and stopping the kthread would properly be performed in scsi_host_dev_release(). However, in the unlikely case that the error handler thread fails to spawn, shost->ehandler is set to ERR_PTR(-ENOMEM).
The error handler cleanup code in scsi_host_dev_release() will call kthread_stop() if shost->ehandler != NULL which will always be the case whether the kthread was successfully spawned or not. In the case that it failed to spawn this has the nasty side effect of trying to dereference an invalid pointer when kthread_stop() is called. The following splat provides an example of this behavior in the wild:
scsi host11: error handler thread failed to spawn, error = -4 Kernel attempted to read user page (10c) - exploit attempt? (uid: 0)
BUG: Kernel NULL pointer dereference on read at 0x0000010c Faulting instruction address: 0xc00000000818e9a8 Oops: Kernel access of bad area, sig: 11 [#1] LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries Modules linked in: ibmvscsi(+) scsi_transport_srp dm_multipath dm_mirror dm_region hash dm_log dm_mod fuse overlay squashfs loop CPU: 12 PID: 274 Comm: systemd-udevd Not tainted 5.13.0-rc7 #1 NIP: c00000000818e9a8 LR: c0000000089846e8 CTR: 0000000000007ee8 REGS: c000000037d12ea0 TRAP: 0300 Not tainted (5.13.0-rc7) MSR: 800000000280b033 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI,LE> CR: 28228228
XER: 20040001
CFAR: c0000000089846e4 DAR: 000000000000010c DSISR: 40000000 IRQMASK: 0
GPR00: c0000000089846e8 c000000037d13140 c000000009cc1100 fffffffffffffffc
GPR04: 0000000000000001 0000000000000000 0000000000000000 c000000037dc0000
GPR08: 0000000000000000 c000000037dc0000 0000000000000001 00000000fffff7ff
GPR12: 0000000000008000 c00000000a049000 c000000037d13d00 000000011134d5a0
GPR16: 0000000000001740 c0080000190d0000 c0080000190d1740 c000000009129288
GPR20: c000000037d13bc0 0000000000000001 c000000037d13bc0 c0080000190b7898
GPR24: c0080000190b7708 0000000000000000 c000000033bb2c48 0000000000000000
GPR28: c000000046b28280 0000000000000000 000000000000010c fffffffffffffffc NIP [c00000000818e9a8] kthread_stop+0x38/0x230
LR [c0000000089846e8] scsi_host_dev_release+0x98/0x160
Call Trace:
[c000000033bb2c48] 0xc000000033bb2c48 (unreliable) [c0000000089846e8] scsi_host_dev_release+0x98/0x160 [c00000000891e960] device_release+0x60/0x100 [c0000000087e55c4] kobject_release+0x84/0x210 [c00000000891ec78] put_device+0x28/0x40 [c000000008984ea4] scsi_host_alloc+0x314/0x430 [c0080000190b38bc] ibmvscsi_probe+0x54/0xad0 [ibmvscsi] [c000000008110104] vio_bus_probe+0xa4/0x4b0 [c00000000892a860] really_probe+0x140/0x680 [c00000000892aefc] driver_probe_device+0x15c/0x200 [c00000000892b63c] device_driver_attach+0xcc/0xe0 [c00000000892b740] __driver_attach+0xf0/0x200 [c000000008926f28] bus_for_each_dev+0xa8/0x130 [c000000008929ce4] driver_attach+0x34/0x50 [c000000008928fc0] bus_add_driver+0x1b0/0x300 [c00000000892c798] driver_register+0x98/0x1a0 [c00000000810eb60] __vio_register_driver+0x80/0xe0 [c0080000190b4a30] ibmvscsi_module_init+0x9c/0xdc [ibmvscsi] [c0000000080121d0] do_one_initcall+0x60/0x2d0 [c000000008261abc] do_init_module+0x7c/0x320 [c000000008265700] load_module+0x2350/0x25b0 [c000000008265cb4] __do_sys_finit_module+0xd4/0x160 [c000000008031110] system_call_exception+0x150/0x2d0 [c00000000800d35c] system_call_common+0xec/0x278
Fix this be nulling shost->ehandler when the kthread fails to spawn.
--- drivers/scsi/hosts.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/hosts.c +1 -0
@@ -497,6 +497,7 @@ struct Scsi_Host *scsi_host_alloc(structshost_printk (KERN_WARNING , shost,"error handler thread failed to spawn, error = %ld\n" ,PTR_ERR (shost->ehandler)); + shost->ehandler =NULL ; goto fail; }
Greg Kroah-Hartman
maintainerPATCH 320/421 tracing: Do not reference char * as a string in histograms
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 704adfb5a9978462cd861f170201ae2b5e3d3a80 upstream.
The histogram logic was allowing events with char * pointers to be used as normal strings. But it was easy to crash the kernel with:
# echo 'hist:keys=filename' > events/syscalls/sys_enter_openat/trigger
And open some files, and boom!
BUG: unable to handle page fault for address: 00007f2ced0c3280 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 1173fa067 P4D 1173fa067 PUD 1171b6067 PMD 1171dd067 PTE 0 Oops: 0000 [#1] PREEMPT SMP CPU: 6 PID: 1810 Comm: cat Not tainted 5.13.0-rc5-test+ #61 Hardware name: Hewlett-Packard HP Compaq Pro 6300 SFF/339A, BIOS K01 v03.03 07/14/2016 RIP: 0010:strlen+0x0/0x20 Code: f6 82 80 2a 0b a9 20 74 11 0f b6 50 01 48 83 c0 01 f6 82 80 2a 0b
a9 20 75 ef c3 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 <80> 3f 00 74 10 48 89 f8 48 83 c0 01 80 38 00 75 f7 48 29 f8 c3
RSP: 0018:ffffbdbf81567b50 EFLAGS: 00010246
RAX: 0000000000000003 RBX: ffff93815cdb3800 RCX: ffff9382401a22d0
RDX: 0000000000000100 RSI: 0000000000000000 RDI: 00007f2ced0c3280
RBP: 0000000000000100 R08: ffff9382409ff074 R09: ffffbdbf81567c98
R10: ffff9382409ff074 R11: 0000000000000000 R12: ffff9382409ff074
R13: 0000000000000001 R14: ffff93815a744f00 R15: 00007f2ced0c3280
FS: 00007f2ced0f8580(0000) GS:ffff93825a800000(0000)
knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f2ced0c3280 CR3: 0000000107069005 CR4: 00000000001706e0
Call Trace: event_hist_trigger+0x463/0x5f0 ? find_held_lock+0x32/0x90 ? sched_clock_cpu+0xe/0xd0 ? lock_release+0x155/0x440 ? kernel_init_free_pages+0x6d/0x90 ? preempt_count_sub+0x9b/0xd0 ? kernel_init_free_pages+0x6d/0x90 ? get_page_from_freelist+0x12c4/0x1680 ? __rb_reserve_next+0xe5/0x460 ? ring_buffer_lock_reserve+0x12a/0x3f0 event_triggers_call+0x52/0xe0 ftrace_syscall_enter+0x264/0x2c0 syscall_trace_enter.constprop.0+0x1ee/0x210 do_syscall_64+0x1c/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae
Where it triggered a fault on strlen(key) where key was the filename.
The reason is that filename is a char * to user space, and the histogram code just blindly dereferenced it, with obvious bad results.
I originally tried to use strncpy_from_user/kernel_nofault() but found that there's other places that its dereferenced and not worth the effort.
Just do not allow "char *" to act like strings.
--- kernel/trace/trace_events_hist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/trace/trace_events_hist.c +3 -3
@@ -2342,7 +2342,9 @@ static struct hist_field *create_hist_fiif (WARN_ON_ONCE (!field)) goto out; -if (is_string_field (field)) { +/* Pointers to strings are just pointers and dangerous to dereference */ +if (is_string_field (field) && + (field->filter_type !=FILTER_PTR_STRING )) { flags |=HIST_FIELD_FL_STRING ; hist_field->size =MAX_FILTER_STR_VAL ;
@@ -4742,8 +4744,6 @@ static inline void add_to_key(char *comp field = key_field->field;if (field->filter_type ==FILTER_DYN_STRING ) size = *(u32 *)(rec + field->offset) >>16 ; -else if (field->filter_type ==FILTER_PTR_STRING ) - size =strlen (key);else if (field->filter_type ==FILTER_STATIC_STRING ) size = field->size;
Greg Kroah-Hartman
maintainerPATCH 321/421 PCI: aardvark: Dont rely on jiffies while holding spinlock
In reply to Greg Kroah-HartmanFrom: Remi Pommarel <[email protected]>
commit 7fbcb5da811be7d47468417c7795405058abb3da upstream.
advk_pcie_wait_pio() can be called while holding a spinlock (from pci_bus_read_config_dword()), then depends on jiffies in order to timeout while polling on PIO state registers. In the case the PIO transaction failed, the timeout will never happen and will also cause the cpu to stall.
This decrements a variable and wait instead of using jiffies.
--- drivers/pci/controller/pci-aardvark.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pci/controller/pci-aardvark.c +5 -5
@@ -166,7 +166,8 @@ (PCIE_CONF_BUS (bus) |PCIE_CONF_DEV (PCI_SLOT (devfn)) | \ PCIE_CONF_FUNC(PCI_FUNC(devfn)) | PCIE_CONF_REG(where)) -#define PIO_TIMEOUT_MS 1 +#define PIO_RETRY_CNT 500 +#define PIO_RETRY_DELAY 2/* 2 us*/ #define LINK_WAIT_MAX_RETRIES 10#define LINK_WAIT_USLEEP_MIN 90000
@@ -369,17 +370,16 @@ static void advk_pcie_check_pio_status(sstatic int advk_pcie_wait_pio (struct advk_pcie *pcie) {struct device *dev = &pcie->pdev->dev; -unsigned long timeout; +int i; - timeout = jiffies +msecs_to_jiffies (PIO_TIMEOUT_MS ); - -while (time_before (jiffies, timeout)) { +for (i =0 ; i <PIO_RETRY_CNT ; i++) {u32 start, isr; start =advk_readl (pcie,PIO_START ); isr =advk_readl (pcie,PIO_ISR );if (!start && isr)return 0 ; +udelay (PIO_RETRY_DELAY ); }dev_err (dev,"config read/write timed out\n" );
Greg Kroah-Hartman
maintainerPATCH 322/421 PCI: aardvark: Fix kernel panic during PIO transfer
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit f18139966d072dab8e4398c95ce955a9742e04f7 upstream.
Trying to start a new PIO transfer by writing value 0 in PIO_START register when previous transfer has not yet completed (which is indicated by value 1 in PIO_START) causes an External Abort on CPU, which results in kernel panic:
SError Interrupt on CPU0, code 0xbf000002 -- SError Kernel panic - not syncing: Asynchronous SError Interrupt
To prevent kernel panic, it is required to reject a new PIO transfer when previous one has not finished yet.
If previous PIO transfer is not finished yet, the kernel may issue a new PIO request only if the previous PIO transfer timed out.
In the past the root cause of this issue was incorrectly identified (as it often happens during link retraining or after link down event) and special hack was implemented in Trusted Firmware to catch all SError events in EL3, to ignore errors with code 0xbf000002 and not forwarding any other errors to kernel and instead throw panic from EL3 Trusted Firmware handler.
Links to discussion and patches about this issue:
https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=3c7dcdac5c50
https://lore.kernel.org/linux-pci/[email protected]/
https://lore.kernel.org/linux-pci/[email protected]/
https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/1541
But the real cause was the fact that during link retraining or after link down event the PIO transfer may take longer time, up to the 1.44s until it times out. This increased probability that a new PIO transfer would be issued by kernel while previous one has not finished yet.
After applying this change into the kernel, it is possible to revert the mentioned TF-A hack and SError events do not have to be caught in TF-A EL3.
--- drivers/pci/controller/pci-aardvark.c | 49 +++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-)
drivers/pci/controller/pci-aardvark.c +40 -9
@@ -382,7 +382,7 @@ static int advk_pcie_wait_pio(struct advudelay (PIO_RETRY_DELAY ); } -dev_err (dev,"config read/write timed out\n" ); +dev_err (dev,"PIO read/write transfer time out\n" );return -ETIMEDOUT ; }
@@ -395,6 +395,35 @@ static bool advk_pcie_valid_device(strucreturn true; } +static bool advk_pcie_pio_is_running (struct advk_pcie *pcie) +{ +struct device *dev = &pcie->pdev->dev; + +/* +* Trying to start a new PIO transfer when previous has not completed +* cause External Abort on CPU which results in kernel panic: +* +* SError Interrupt on CPU0, code 0xbf000002 -- SError +* Kernel panic - not syncing: Asynchronous SError Interrupt +* +* Functions advk_pcie_rd_conf() and advk_pcie_wr_conf() are protected +* by raw_spin_lock_irqsave() at pci_lock_config() level to prevent +* concurrent calls at the same time. But because PIO transfer may take +* about 1.5s when link is down or card is disconnected, it means that +* advk_pcie_wait_pio() does not always have to wait for completion. +* +* Some versions of ARM Trusted Firmware handles this External Abort at +* EL3 level and mask it to prevent kernel panic. Relevant TF-A commit: +* https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=3c7dcdac5c50 +*/ +if (advk_readl (pcie,PIO_START )) { +dev_err (dev,"Previous PIO read/write transfer is still running\n" ); +return true; + } + +return false; +} +static int advk_pcie_rd_conf (struct pci_bus *bus,u32 devfn,int where,int size,u32 *val) {
@@ -407,9 +436,10 @@ static int advk_pcie_rd_conf(struct pci_return PCIBIOS_DEVICE_NOT_FOUND ; } -/* Start PIO */ -advk_writel (pcie,0 ,PIO_START ); -advk_writel (pcie,1 ,PIO_ISR ); +if (advk_pcie_pio_is_running (pcie)) { + *val =0xffffffff ; +return PCIBIOS_SET_FAILED ; + }/* Program the control register */ reg =advk_readl (pcie,PIO_CTRL );
@@ -428,7 +458,8 @@ static int advk_pcie_rd_conf(struct pci_/* Program the data strobe */ advk_writel (pcie,0xf ,PIO_WR_DATA_STRB ); -/* Start the transfer */ +/* Clear PIO DONE ISR and start the transfer */ +advk_writel (pcie,1 ,PIO_ISR );advk_writel (pcie,1 ,PIO_START ); ret =advk_pcie_wait_pio (pcie);
@@ -462,9 +493,8 @@ static int advk_pcie_wr_conf(struct pci_if (where % size)return PCIBIOS_SET_FAILED ; -/* Start PIO */ -advk_writel (pcie,0 ,PIO_START ); -advk_writel (pcie,1 ,PIO_ISR ); +if (advk_pcie_pio_is_running (pcie)) +return PCIBIOS_SET_FAILED ;/* Program the control register */ reg =advk_readl (pcie,PIO_CTRL );
@@ -491,7 +521,8 @@ static int advk_pcie_wr_conf(struct pci_/* Program the data strobe */ advk_writel (pcie, data_strobe,PIO_WR_DATA_STRB ); -/* Start the transfer */ +/* Clear PIO DONE ISR and start the transfer */ +advk_writel (pcie,1 ,PIO_ISR );advk_writel (pcie,1 ,PIO_START ); ret =advk_pcie_wait_pio (pcie);
Greg Kroah-Hartman
maintainerPATCH 323/421 tty: serial: fsl_lpuart: fix the potential risk of division or modulo by zero
In reply to Greg Kroah-HartmanFrom: Sherry Sun <[email protected]>
[ Upstream commit fcb10ee27fb91b25b68d7745db9817ecea9f1038 ]
We should be very careful about the register values that will be used for division or modulo operations, althrough the possibility that the UARTBAUD register value is zero is very low, but we had better to deal with the "bad data" of hardware in advance to avoid division or modulo by zero leading to undefined kernel behavior.
--- drivers/tty/serial/fsl_lpuart.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/fsl_lpuart.c +3 -0
@@ -1992,6 +1992,9 @@ lpuart32_console_get_options(struct lpuart_port *sport, int *baud, bd =lpuart32_read (&sport->port,UARTBAUD ); bd &=UARTBAUD_SBR_MASK ; +if (!bd) +return ; + sbr = bd; uartclk =clk_get_rate (sport->clk);/*
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 324/421 misc/libmasm/module: Fix two use after free in ibmasm_init_one
In reply to Greg Kroah-HartmanFrom: Lv Yunlong <[email protected]>
[ Upstream commit 7272b591c4cb9327c43443f67b8fbae7657dd9ae ]
In ibmasm_init_one, it calls ibmasm_init_remote_input_dev(). Inside ibmasm_init_remote_input_dev, mouse_dev and keybd_dev are allocated by input_allocate_device(), and assigned to sp->remote.mouse_dev and sp->remote.keybd_dev respectively.
In the err_free_devices error branch of ibmasm_init_one, mouse_dev and keybd_dev are freed by input_free_device(), and return error. Then the execution runs into error_send_message error branch of ibmasm_init_one, where ibmasm_free_remote_input_dev(sp) is called to unregister the freed sp->remote.mouse_dev and sp->remote.keybd_dev.
My patch add a "error_init_remote" label to handle the error of ibmasm_init_remote_input_dev(), to avoid the uaf bugs.
--- drivers/misc/ibmasm/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/ibmasm/module.c +3 -2
@@ -125,7 +125,7 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id) result =ibmasm_init_remote_input_dev (sp);if (result) {dev_err (sp->dev,"Failed to initialize remote queue\n" ); - goto error_send_message; + goto error_init_remote; } result =ibmasm_send_driver_vpd (sp);
@@ -145,8 +145,9 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)return 0 ; error_send_message: -disable_sp_interrupts (sp->base_address);ibmasm_free_remote_input_dev (sp); +error_init_remote: +disable_sp_interrupts (sp->base_address);free_irq (sp->irq, (void *)sp); error_request_irq:iounmap (sp->base_address);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 325/421 Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro"
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit 5d6fb80a142b5994355ce675c517baba6089d199 ]
This reverts commit 0edabdfe89581669609eaac5f6a8d0ae6fe95e7f.
I've explained that optional FireWire card for d.2 is also built-in to d.2 Pro, however it's wrong. The optional card uses DM1000 ASIC and has 'Mackie DJ Mixer' in its model name of configuration ROM. On the other hand, built-in FireWire card for d.2 Pro and d.4 Pro uses OXFW971 ASIC and has 'd.Pro' in its model name according to manuals and user experiences. The former card is not the card for d.2 Pro. They are similar in appearance but different internally.
--- sound/firewire/Kconfig | 4 ++-- sound/firewire/bebob/bebob.c | 2 +- sound/firewire/oxfw/oxfw.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
sound/firewire/Kconfig +2 -2
@@ -37,7 +37,7 @@ config SND_OXFW * Mackie(Loud) Onyx 1640i (former model) * Mackie(Loud) Onyx Satellite * Mackie(Loud) Tapco Link.Firewire - * Mackie(Loud) d.4 pro + * Mackie(Loud) d.2 pro/d.4 pro (built-in FireWire card with OXFW971 ASIC) * Mackie(Loud) U.420/U.420d * TASCAM FireOne * Stanton Controllers & Systems 1 Deck/Mixer
@@ -83,7 +83,7 @@ config SND_BEBOB * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394 * BridgeCo RDAudio1/Audio5 * Mackie Onyx 1220/1620/1640 (FireWire I/O Card) - * Mackie d.2 (FireWire Option) and d.2 Pro + * Mackie d.2 (optional FireWire card with DM1000 ASIC) * Stanton FinalScratch 2 (ScratchAmp) * Tascam IF-FW/DM * Behringer XENIX UFX 1204/1604
sound/firewire/bebob/bebob.c +1 -1
@@ -414,7 +414,7 @@ static const struct ieee1394_device_id bebob_id_table[] = {SND_BEBOB_DEV_ENTRY (VEN_BRIDGECO ,0x00010049 , &spec_normal),/* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ SND_BEBOB_DEV_ENTRY (VEN_MACKIE2 ,0x00010065 , &spec_normal), -// Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in). +// Mackie, d.2 (optional Firewire card with DM1000). SND_BEBOB_DEV_ENTRY (VEN_MACKIE1 ,0x00010067 , &spec_normal),/* Stanton, ScratchAmp */ SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal),
sound/firewire/oxfw/oxfw.c +1 -1
@@ -400,7 +400,7 @@ static const struct ieee1394_device_id oxfw_id_table[] = {* Onyx-i series (former models): 0x081216 * Mackie Onyx Satellite: 0x00200f * Tapco LINK.firewire 4x6: 0x000460 -* d.4 pro: Unknown +* d.2 pro/d.4 pro (built-in card): Unknown * U.420: Unknown * U.420d: Unknown */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 326/421 w1: ds2438: fixing bug that would always get page0
In reply to Greg Kroah-HartmanFrom: Luiz Sampaio <[email protected]>
[ Upstream commit 1f5e7518f063728aee0679c5086b92d8ea429e11 ]
The purpose of the w1_ds2438_get_page function is to get the register values at the page passed as the pageno parameter. However, the page0 was hardcoded, such that the function always returned the page0 contents. Fixed so that the function can retrieve any page.
--- drivers/w1/slaves/w1_ds2438.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/w1/slaves/w1_ds2438.c +2 -2
@@ -64,13 +64,13 @@ static int w1_ds2438_get_page(struct w1_slave *sl, int pageno, u8 *buf)if (w1_reset_select_slave (sl))continue ; w1_buf[0 ] =W1_DS2438_RECALL_MEMORY ; - w1_buf[1 ] =0x00 ; + w1_buf[1 ] = (u8 )pageno;w1_write_block (sl->master, w1_buf,2 );if (w1_reset_select_slave (sl))continue ; w1_buf[0 ] =W1_DS2438_READ_SCRATCH ; - w1_buf[1 ] =0x00 ; + w1_buf[1 ] = (u8 )pageno;w1_write_block (sl->master, w1_buf,2 ); count =w1_read_block (sl->master, buf,DS2438_PAGE_SIZE +1 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 327/421 scsi: lpfc: Fix "Unexpected timeout" error in direct attach topology
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit e30d55137edef47434c40d7570276a0846fe922c ]
An 'unexpected timeout' message may be seen in a point-2-point topology. The message occurs when a PLOGI is received before the driver is notified of FLOGI completion. The FLOGI completion failure causes discovery to be triggered for a second time. The discovery timer is restarted but no new discovery activity is initiated, thus the timeout message eventually appears.
In point-2-point, when discovery has progressed before the FLOGI completion is processed, it is not a failure. Add code to FLOGI completion to detect that discovery has progressed and exit the FLOGI handling (noop'ing it).
--- drivers/scsi/lpfc/lpfc_els.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/scsi/lpfc/lpfc_els.c +9 -0
@@ -1176,6 +1176,15 @@ stop_rr_fcf_flogi: phba->fcf.fcf_redisc_attempted =0 ;/* reset */ goto out; } + }else if (vport->port_state >LPFC_FLOGI && + vport->fc_flag &FC_PT2PT ) { +/* +* In a p2p topology, it is possible that discovery has +* already progressed, and this completion can be ignored. +* Recheck the indicated topology. +*/ +if (!sp->cmn.fPort) + goto out; } flogifail:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 328/421 scsi: lpfc: Fix crash when lpfc_sli4_hba_setup() fails to initialize the SGLs
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 5aa615d195f1e142c662cb2253f057c9baec7531 ]
The driver is encountering a crash in lpfc_free_iocb_list() while performing initial attachment.
Code review found this to be an errant failure path that was taken, jumping to a tag that then referenced structures that were uninitialized.
Fix the failure path.
--- drivers/scsi/lpfc/lpfc_sli.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +3 -2
@@ -7281,7 +7281,7 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)"0393 Error %d during rpi post operation\n" , rc); rc = -ENODEV ; - goto out_destroy_queue; + goto out_free_iocblist; }lpfc_sli4_node_prep (phba);
@@ -7406,8 +7406,9 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) out_unset_queue:/* Unset all the queues set up in this routine when error out */ lpfc_sli4_queue_unset (phba); -out_destroy_queue: +out_free_iocblist:lpfc_free_iocb_list (phba); +out_destroy_queue:lpfc_sli4_queue_destroy (phba); out_stop_timers:lpfc_stop_hba_timers (phba);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 329/421 scsi: core: Cap scsi_host cmd_per_lun at can_queue
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
[ Upstream commit ea2f0f77538c50739b9fb4de4700cee5535e1f77 ]
The sysfs handling function sdev_store_queue_depth() enforces that the sdev queue depth cannot exceed shost can_queue. The initial sdev queue depth comes from shost cmd_per_lun. However, the LLDD may manually set cmd_per_lun to be larger than can_queue, which leads to an initial sdev queue depth greater than can_queue.
Such an issue was reported in [0], which caused a hang. That has since been fixed in commit fc09acb7de31 ("scsi: scsi_debug: Fix cmd_per_lun, set to max_queue").
Stop this possibly happening for other drivers by capping shost cmd_per_lun at shost can_queue.
[0] https://lore.kernel.org/linux-scsi/YHaez6iN2HHYxYOh@T590/
--- drivers/scsi/hosts.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/hosts.c +3 -0
@@ -218,6 +218,9 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, goto fail; } + shost->cmd_per_lun =min_t (short, shost->cmd_per_lun, + shost->can_queue); + error =scsi_init_sense_cache (shost);if (error) goto fail;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 330/421 ALSA: ac97: fix PM reference leak in ac97_bus_remove()
In reply to Greg Kroah-HartmanFrom: Yufen Yu <[email protected]>
[ Upstream commit a38e93302ee25b2ca6f4ee76c6c974cf3637985e ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. Fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- sound/ac97/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/ac97/bus.c +1 -1
@@ -523,7 +523,7 @@ static int ac97_bus_remove(struct device *dev)struct ac97_codec_driver *adrv =to_ac97_driver (dev->driver);int ret; - ret =pm_runtime_get_sync (dev); + ret =pm_runtime_resume_and_get (dev);if (ret <0 )return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 331/421 tty: serial: 8250: serial_cs: Fix a memory leak in error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit fad92b11047a748c996ebd6cfb164a63814eeb2e ]
In the probe function, if the final 'serial_config()' fails, 'info' is leaking.
Add a resource handling path to free this memory.
--- drivers/tty/serial/8250/serial_cs.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/serial_cs.c +10 -1
@@ -306,6 +306,7 @@ static int serial_resume(struct pcmcia_device *link)static int serial_probe (struct pcmcia_device *link) {struct serial_info *info; +int ret;dev_dbg (&link->dev,"serial_attach()\n" );
@@ -320,7 +321,15 @@ static int serial_probe(struct pcmcia_device *link)if (do_sound) link->config_flags |=CONF_ENABLE_SPKR ; -return serial_config (link); + ret =serial_config (link); +if (ret) + goto free_info; + +return 0 ; + +free_info: +kfree (info); +return ret; }static void serial_detach (struct pcmcia_device *link)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 332/421 scsi: scsi_dh_alua: Check for negative result value
In reply to Greg Kroah-HartmanFrom: Hannes Reinecke <[email protected]>
[ Upstream commit 7e26e3ea028740f934477ec01ba586ab033c35aa ]
scsi_execute() will now return a negative error if there was an error prior to command submission; evaluate that instead if checking for DRIVER_ERROR.
[mkp: build fix]
--- drivers/scsi/device_handler/scsi_dh_alua.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/device_handler/scsi_dh_alua.c +4 -4
@@ -562,12 +562,12 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)kfree (buff);return SCSI_DH_OK ; } -if (!scsi_sense_valid (&sense_hdr)) { +if (retval <0 || !scsi_sense_valid (&sense_hdr)) {sdev_printk (KERN_INFO , sdev,"%s: rtpg failed, result %d\n" ,ALUA_DH_NAME , retval);kfree (buff); -if (driver_byte (retval) ==DRIVER_ERROR ) +if (retval <0 )return SCSI_DH_DEV_TEMP_BUSY ;return SCSI_DH_IO ; }
@@ -789,11 +789,11 @@ static unsigned alua_stpg(struct scsi_device *sdev, struct alua_port_group *pg) retval =submit_stpg (sdev, pg->group_id, &sense_hdr);if (retval) { -if (!scsi_sense_valid (&sense_hdr)) { +if (retval <0 || !scsi_sense_valid (&sense_hdr)) {sdev_printk (KERN_INFO , sdev,"%s: stpg failed, result %d" ,ALUA_DH_NAME , retval); -if (driver_byte (retval) ==DRIVER_ERROR ) +if (retval <0 )return SCSI_DH_DEV_TEMP_BUSY ; }else { sdev_printk(KERN_INFO, sdev, "%s: stpg failed\n",
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 333/421 fs/jfs: Fix missing error code in lmLogInit()
In reply to Greg Kroah-HartmanFrom: Jiapeng Chong <[email protected]>
[ Upstream commit 492109333c29e1bb16d8732e1d597b02e8e0bf2e ]
The error code is missing in this code scenario, add the error code '-EINVAL' to the return value 'rc.
Eliminate the follow smatch warning:
fs/jfs/jfs_logmgr.c:1327 lmLogInit() warn: missing error code 'rc'.
--- fs/jfs/jfs_logmgr.c | 1 + 1 file changed, 1 insertion(+)
fs/jfs/jfs_logmgr.c +1 -0
@@ -1338,6 +1338,7 @@ int lmLogInit(struct jfs_log * log) }else {if (memcmp (logsuper->uuid, log->uuid,16 )) {jfs_warn ("wrong uuid on JFS log device" ); + rc = -EINVAL ; goto errout20; } log->size =le32_to_cpu (logsuper->size);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 334/421 scsi: iscsi: Add iscsi_cls_conn refcount helpers
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit b1d19e8c92cfb0ded180ef3376c20e130414e067 ]
There are a couple places where we could free the iscsi_cls_conn while it's still in use. This adds some helpers to get/put a refcount on the struct and converts an exiting user. Subsequent commits will then use the helpers to fix 2 bugs in the eh code.
--- drivers/scsi/libiscsi.c | 7 ++----- drivers/scsi/scsi_transport_iscsi.c | 12 ++++++++++++ include/scsi/scsi_transport_iscsi.h | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-)
drivers/scsi/libiscsi.c +2 -5
@@ -1385,7 +1385,6 @@ void iscsi_session_failure(struct iscsi_session *session, enum iscsi_err err) {struct iscsi_conn *conn; -struct device *dev;spin_lock_bh (&session->frwd_lock); conn = session->leadconn;
@@ -1394,10 +1393,8 @@ void iscsi_session_failure(struct iscsi_session *session,return ; } - dev =get_device (&conn->cls_conn->dev); +iscsi_get_conn (conn->cls_conn);spin_unlock_bh (&session->frwd_lock); -if (!dev) -return ;/* * if the host is being removed bypass the connection * recovery initialization because we are going to kill
@@ -1407,7 +1404,7 @@ void iscsi_session_failure(struct iscsi_session *session,iscsi_conn_error_event (conn->cls_conn, err); elseiscsi_conn_failure (conn ,err ); -put_device (dev); +iscsi_put_conn (conn->cls_conn); }EXPORT_SYMBOL_GPL (iscsi_session_failure);
drivers/scsi/scsi_transport_iscsi.c +12 -0
@@ -2306,6 +2306,18 @@ int iscsi_destroy_conn(struct iscsi_cls_conn *conn) }EXPORT_SYMBOL_GPL (iscsi_destroy_conn); +void iscsi_put_conn (struct iscsi_cls_conn *conn) +{ +put_device (&conn->dev); +} +EXPORT_SYMBOL_GPL (iscsi_put_conn); + +void iscsi_get_conn (struct iscsi_cls_conn *conn) +{ +get_device (&conn->dev); +} +EXPORT_SYMBOL_GPL (iscsi_get_conn); +/* * iscsi interface functions */
include/scsi/scsi_transport_iscsi.h +2 -0
@@ -436,6 +436,8 @@ extern void iscsi_remove_session(struct iscsi_cls_session *session);extern void iscsi_free_session (struct iscsi_cls_session *session);extern struct iscsi_cls_conn *iscsi_create_conn (struct iscsi_cls_session *sess,int dd_size,uint32_t cid); +extern void iscsi_put_conn (struct iscsi_cls_conn *conn); +extern void iscsi_get_conn (struct iscsi_cls_conn *conn);extern int iscsi_destroy_conn (struct iscsi_cls_conn *conn);extern void iscsi_unblock_session (struct iscsi_cls_session *session);extern void iscsi_block_session (struct iscsi_cls_session *session);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 335/421 scsi: iscsi: Fix conn use after free during resets
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit ec29d0ac29be366450a7faffbcf8cba3a6a3b506 ]
If we haven't done a unbind target call we can race where iscsi_conn_teardown wakes up the EH thread and then frees the conn while those threads are still accessing the conn ehwait.
We can only do one TMF per session so this just moves the TMF fields from the conn to the session. We can then rely on the iscsi_session_teardown->iscsi_remove_session->__iscsi_unbind_session call to remove the target and it's devices, and know after that point there is no device or scsi-ml callout trying to access the session.
--- drivers/scsi/libiscsi.c | 115 +++++++++++++++++++--------------------- include/scsi/libiscsi.h | 11 ++-- 2 files changed, 60 insertions(+), 66 deletions(-)
drivers/scsi/libiscsi.c +55 -60
@@ -259,11 +259,11 @@ static int iscsi_prep_bidi_ahs(struct iscsi_task *task)*/ static int iscsi_check_tmf_restrictions (struct iscsi_task *task,int opcode) { -struct iscsi_conn *conn = task->conn; -struct iscsi_tm *tmf = &conn->tmhdr; +struct iscsi_session *session = task->conn->session; +struct iscsi_tm *tmf = &session->tmhdr;u64 hdr_lun; -if (conn->tmf_state ==TMF_INITIAL ) +if (session->tmf_state ==TMF_INITIAL )return 0 ;if ((tmf->opcode &ISCSI_OPCODE_MASK ) !=ISCSI_OP_SCSI_TMFUNC )
@@ -283,24 +283,19 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)* Fail all SCSI cmd PDUs */ if (opcode !=ISCSI_OP_SCSI_DATA_OUT ) { -iscsi_conn_printk (KERN_INFO , conn, -"task [op %x itt " -"0x%x/0x%x] " -"rejected.\n" , - opcode, task->itt, - task->hdr_itt); +iscsi_session_printk (KERN_INFO , session, +"task [op %x itt 0x%x/0x%x] rejected.\n" , + opcode, task->itt, task->hdr_itt);return -EACCES ; }/* * And also all data-out PDUs in response to R2T * if fast_abort is set. */ -if (conn->session->fast_abort) { -iscsi_conn_printk (KERN_INFO , conn, -"task [op %x itt " -"0x%x/0x%x] fast abort.\n" , - opcode, task->itt, - task->hdr_itt); +if (session->fast_abort) { +iscsi_session_printk (KERN_INFO , session, +"task [op %x itt 0x%x/0x%x] fast abort.\n" , + opcode, task->itt, task->hdr_itt);return -EACCES ; }break ;
@@ -313,7 +308,7 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)*/ if (opcode ==ISCSI_OP_SCSI_DATA_OUT && task->hdr_itt == tmf->rtt) { - ISCSI_DBG_SESSION(conn->session, + ISCSI_DBG_SESSION(session, "Preventing task %x/%x from sending " "data-out due to abort task in " "progress\n", task->itt,
@@ -970,20 +965,21 @@ iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,static void iscsi_tmf_rsp (struct iscsi_conn *conn,struct iscsi_hdr *hdr) {struct iscsi_tm_rsp *tmf = (struct iscsi_tm_rsp *)hdr; +struct iscsi_session *session = conn->session; conn->exp_statsn =be32_to_cpu (hdr->statsn) +1 ; conn->tmfrsp_pdus_cnt++; -if (conn->tmf_state !=TMF_QUEUED ) +if (session->tmf_state !=TMF_QUEUED )return ;if (tmf->response ==ISCSI_TMF_RSP_COMPLETE ) - conn->tmf_state =TMF_SUCCESS ; + session->tmf_state =TMF_SUCCESS ;else if (tmf->response ==ISCSI_TMF_RSP_NO_TASK ) - conn->tmf_state =TMF_NOT_FOUND ; + session->tmf_state =TMF_NOT_FOUND ;else - conn->tmf_state =TMF_FAILED ; -wake_up (&conn->ehwait); + session->tmf_state =TMF_FAILED ; +wake_up (&session->ehwait); }static int iscsi_send_nopout (struct iscsi_conn *conn,struct iscsi_nopin *rhdr)
@@ -1822,15 +1818,14 @@ EXPORT_SYMBOL_GPL(iscsi_target_alloc);static void iscsi_tmf_timedout (struct timer_list *t) { -struct iscsi_conn *conn =from_timer (conn, t, tmf_timer); -struct iscsi_session *session = conn->session; +struct iscsi_session *session =from_timer (session, t, tmf_timer);spin_lock (&session->frwd_lock); -if (conn->tmf_state ==TMF_QUEUED ) { - conn->tmf_state =TMF_TIMEDOUT ; +if (session->tmf_state ==TMF_QUEUED ) { + session->tmf_state =TMF_TIMEDOUT ;ISCSI_DBG_EH (session,"tmf timedout\n" );/* unblock eh_abort() */ -wake_up (&conn->ehwait); +wake_up (&session->ehwait); }spin_unlock (&session->frwd_lock); }
@@ -1853,8 +1848,8 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,return -EPERM ; } conn->tmfcmd_pdus_cnt++; - conn->tmf_timer.expires = timeout *HZ + jiffies; -add_timer (&conn->tmf_timer); + session->tmf_timer.expires = timeout *HZ + jiffies; +add_timer (&session->tmf_timer);ISCSI_DBG_EH (session,"tmf set timeout\n" );spin_unlock_bh (&session->frwd_lock);
@@ -1868,12 +1863,12 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,* 3) session is terminated or restarted or userspace has * given up on recovery */ -wait_event_interruptible (conn->ehwait, age != session->age || +wait_event_interruptible (session->ehwait, age != session->age || session->state !=ISCSI_STATE_LOGGED_IN || - conn->tmf_state !=TMF_QUEUED ); + session->tmf_state !=TMF_QUEUED );if (signal_pending (current))flush_signals (current); -del_timer_sync (&conn->tmf_timer); +del_timer_sync (&session->tmf_timer);mutex_lock (&session->eh_mutex);spin_lock_bh (&session->frwd_lock);
@@ -2233,17 +2228,17 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) }/* only have one tmf outstanding at a time */ -if (conn->tmf_state !=TMF_INITIAL ) +if (session->tmf_state !=TMF_INITIAL ) goto failed; - conn->tmf_state =TMF_QUEUED ; + session->tmf_state =TMF_QUEUED ; - hdr = &conn->tmhdr; + hdr = &session->tmhdr;iscsi_prep_abort_task_pdu (task, hdr);if (iscsi_exec_task_mgmt_fn (conn, hdr, age, session->abort_timeout)) goto failed; -switch (conn->tmf_state) { +switch (session->tmf_state) {case TMF_SUCCESS :spin_unlock_bh (&session->frwd_lock);/*
@@ -2258,7 +2253,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)*/ spin_lock_bh (&session->frwd_lock);fail_scsi_task (task,DID_ABORT ); - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ;memset (hdr,0 ,sizeof (*hdr));spin_unlock_bh (&session->frwd_lock);iscsi_start_tx (conn);
@@ -2269,7 +2264,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) goto failed_unlocked;case TMF_NOT_FOUND :if (!sc->SCp.ptr) { - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ;memset (hdr,0 ,sizeof (*hdr));/* task completed before tmf abort response */ ISCSI_DBG_EH(session, "sc completed while abort in "
@@ -2278,7 +2273,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) }/* fall through */ default : - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ; goto failed; }
@@ -2335,11 +2330,11 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc) conn = session->leadconn;/* only have one tmf outstanding at a time */ -if (conn->tmf_state !=TMF_INITIAL ) +if (session->tmf_state !=TMF_INITIAL ) goto unlock; - conn->tmf_state =TMF_QUEUED ; + session->tmf_state =TMF_QUEUED ; - hdr = &conn->tmhdr; + hdr = &session->tmhdr;iscsi_prep_lun_reset_pdu (sc, hdr); if (iscsi_exec_task_mgmt_fn(conn, hdr, session->age,
@@ -2348,7 +2343,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc) goto unlock; } -switch (conn->tmf_state) { +switch (session->tmf_state) {case TMF_SUCCESS :break ;case TMF_TIMEDOUT :
@@ -2356,7 +2351,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)iscsi_conn_failure (conn,ISCSI_ERR_SCSI_EH_SESSION_RST ); goto done;default : - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ; goto unlock; }
@@ -2368,7 +2363,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)spin_lock_bh (&session->frwd_lock);memset (hdr,0 ,sizeof (*hdr));fail_scsi_tasks (conn, sc->device->lun,DID_ERROR ); - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ;spin_unlock_bh (&session->frwd_lock);iscsi_start_tx (conn);
@@ -2391,8 +2386,7 @@ void iscsi_session_recovery_timedout(struct iscsi_cls_session *cls_session)spin_lock_bh (&session->frwd_lock);if (session->state !=ISCSI_STATE_LOGGED_IN ) { session->state =ISCSI_STATE_RECOVERY_FAILED ; -if (session->leadconn) -wake_up (&session->leadconn->ehwait); +wake_up (&session->ehwait); }spin_unlock_bh (&session->frwd_lock); }
@@ -2437,7 +2431,7 @@ failed:iscsi_conn_failure (conn,ISCSI_ERR_SCSI_EH_SESSION_RST );ISCSI_DBG_EH (session,"wait for relogin\n" ); -wait_event_interruptible (conn->ehwait, +wait_event_interruptible (session->ehwait, session->state ==ISCSI_STATE_TERMINATE || session->state ==ISCSI_STATE_LOGGED_IN || session->state ==ISCSI_STATE_RECOVERY_FAILED );
@@ -2498,11 +2492,11 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc) conn = session->leadconn;/* only have one tmf outstanding at a time */ -if (conn->tmf_state !=TMF_INITIAL ) +if (session->tmf_state !=TMF_INITIAL ) goto unlock; - conn->tmf_state =TMF_QUEUED ; + session->tmf_state =TMF_QUEUED ; - hdr = &conn->tmhdr; + hdr = &session->tmhdr;iscsi_prep_tgt_reset_pdu (sc, hdr); if (iscsi_exec_task_mgmt_fn(conn, hdr, session->age,
@@ -2511,7 +2505,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc) goto unlock; } -switch (conn->tmf_state) { +switch (session->tmf_state) {case TMF_SUCCESS :break ;case TMF_TIMEDOUT :
@@ -2519,7 +2513,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc)iscsi_conn_failure (conn,ISCSI_ERR_SCSI_EH_SESSION_RST ); goto done;default : - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ; goto unlock; }
@@ -2531,7 +2525,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc)spin_lock_bh (&session->frwd_lock);memset (hdr,0 ,sizeof (*hdr));fail_scsi_tasks (conn,-1 ,DID_ERROR ); - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ;spin_unlock_bh (&session->frwd_lock);iscsi_start_tx (conn);
@@ -2836,7 +2830,10 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost, session->tt = iscsit; session->dd_data = cls_session->dd_data +sizeof (*session); + session->tmf_state =TMF_INITIAL ; +timer_setup (&session->tmf_timer, iscsi_tmf_timedout,0 );mutex_init (&session->eh_mutex); +spin_lock_init (&session->frwd_lock);spin_lock_init (&session->back_lock);
@@ -2940,7 +2937,6 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size, conn->c_stage =ISCSI_CONN_INITIAL_STAGE ; conn->id = conn_idx; conn->exp_statsn =0 ; - conn->tmf_state =TMF_INITIAL ;timer_setup (&conn->transport_timer, iscsi_check_transport_timeouts,0 );
@@ -2966,8 +2962,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size, goto login_task_data_alloc_fail; conn->login_task->data = conn->data = data; -timer_setup (&conn->tmf_timer, iscsi_tmf_timedout,0 ); -init_waitqueue_head (&conn->ehwait); +init_waitqueue_head (&session->ehwait);return cls_conn;
@@ -3002,7 +2997,7 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)* leading connection? then give up on recovery. */ session->state =ISCSI_STATE_TERMINATE ; -wake_up (&conn->ehwait); +wake_up (&session->ehwait); }spin_unlock_bh (&session->frwd_lock);
@@ -3077,7 +3072,7 @@ int iscsi_conn_start(struct iscsi_cls_conn *cls_conn)* commands after successful recovery */ conn->stop_stage =0 ; - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ; session->age++;if (session->age ==16 ) session->age =0 ;
@@ -3091,7 +3086,7 @@ int iscsi_conn_start(struct iscsi_cls_conn *cls_conn)spin_unlock_bh (&session->frwd_lock);iscsi_unblock_session (session->cls_session); -wake_up (&conn->ehwait); +wake_up (&session->ehwait);return 0 ; }EXPORT_SYMBOL_GPL (iscsi_conn_start);
@@ -3177,7 +3172,7 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,spin_lock_bh (&session->frwd_lock);fail_scsi_tasks (conn,-1 ,DID_TRANSPORT_DISRUPTED );fail_mgmt_tasks (session, conn); -memset (&conn->tmhdr,0 ,sizeof (conn->tmhdr)); +memset (&session->tmhdr,0 ,sizeof (session->tmhdr));spin_unlock_bh (&session->frwd_lock);mutex_unlock (&session->eh_mutex); }
include/scsi/libiscsi.h +5 -6
@@ -208,12 +208,6 @@ struct iscsi_conn {unsigned long suspend_tx;/* suspend Tx */ unsigned long suspend_rx;/* suspend Rx */ -/* abort */ -wait_queue_head_t ehwait;/* used in eh_abort() */ -struct iscsi_tm tmhdr; -struct timer_list tmf_timer; -int tmf_state;/* see TMF_INITIAL, etc.*/ -/* negotiated params */ unsigned max_recv_dlength;/* initiator_max_recv_dsl*/ unsigned max_xmit_dlength;/* target_max_recv_dsl */
@@ -283,6 +277,11 @@ struct iscsi_session {* and recv lock. */ struct mutex eh_mutex; +/* abort */ +wait_queue_head_t ehwait;/* used in eh_abort() */ +struct iscsi_tm tmhdr; +struct timer_list tmf_timer; +int tmf_state;/* see TMF_INITIAL, etc.*/ /* iSCSI session-wide sequencing */ uint32_t cmdsn;
Signature · 1 line
2.30.2