Re: [PATCH 1/1] staging: media: msi3101: sdr-msi3101.c - replace with time_before_eq()

[Antti Palosaari]

Moikka!
That is already fixed by someone else and patch is somewhere Mauro or 
Hans queue.

regards
Antti

On 06/29/2014 08:20 AM, Anil Belur wrote:
> From: Anil Belur <askb23@xxxxxxxxx>
>
> - this fix replaces jiffies interval comparision with safer function to
>    avoid any overflow and wrap around ?
>
> Signed-off-by: Anil Belur <askb23@xxxxxxxxx>
> ---
>   drivers/staging/media/msi3101/sdr-msi3101.c | 16 ++++++++++++----
>   1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/staging/media/msi3101/sdr-msi3101.c
> index 08d0d09..b828857 100644
> --- a/drivers/staging/media/msi3101/sdr-msi3101.c
> +++ b/drivers/staging/media/msi3101/sdr-msi3101.c
> @@ -180,6 +180,7 @@ static int msi3101_convert_stream_504(struct msi3101_state *s, u8 *dst,
>   {
>   	int i, i_max, dst_len = 0;
>   	u32 sample_num[3];
> +	unsigned long expires;
>
>   	/* There could be 1-3 1024 bytes URB frames */
>   	i_max = src_len / 1024;
> @@ -208,7 +209,8 @@ static int msi3101_convert_stream_504(struct msi3101_state *s, u8 *dst,
>   	}
>
>   	/* calculate samping rate and output it in 10 seconds intervals */
> -	if ((s->jiffies_next + msecs_to_jiffies(10000)) <= jiffies) {
> +	expires = s->jiffies_next + msecs_to_jiffies(10000);
> +	if (time_before_eq(expires, jiffies)) {
>   		unsigned long jiffies_now = jiffies;
>   		unsigned long msecs = jiffies_to_msecs(jiffies_now) - jiffies_to_msecs(s->jiffies_next);
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;
> @@ -332,6 +334,7 @@ static int msi3101_convert_stream_384(struct msi3101_state *s, u8 *dst,
>   {
>   	int i, i_max, dst_len = 0;
>   	u32 sample_num[3];
> +	unsigned long expires;
>
>   	/* There could be 1-3 1024 bytes URB frames */
>   	i_max = src_len / 1024;
> @@ -360,7 +363,8 @@ static int msi3101_convert_stream_384(struct msi3101_state *s, u8 *dst,
>   	}
>
>   	/* calculate samping rate and output it in 10 seconds intervals */
> -	if ((s->jiffies_next + msecs_to_jiffies(10000)) <= jiffies) {
> +	expires = s->jiffies_next + msecs_to_jiffies(10000);
> +	if (time_before_eq(expires, jiffies)) {
>   		unsigned long jiffies_now = jiffies;
>   		unsigned long msecs = jiffies_to_msecs(jiffies_now) - jiffies_to_msecs(s->jiffies_next);
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;
> @@ -397,6 +401,7 @@ static int msi3101_convert_stream_336(struct msi3101_state *s, u8 *dst,
>   {
>   	int i, i_max, dst_len = 0;
>   	u32 sample_num[3];
> +	unsigned long expires;
>
>   	/* There could be 1-3 1024 bytes URB frames */
>   	i_max = src_len / 1024;
> @@ -425,7 +430,8 @@ static int msi3101_convert_stream_336(struct msi3101_state *s, u8 *dst,
>   	}
>
>   	/* calculate samping rate and output it in 10 seconds intervals */
> -	if ((s->jiffies_next + msecs_to_jiffies(10000)) <= jiffies) {
> +	expires = s->jiffies_next + msecs_to_jiffies(10000);
> +	if (time_before_eq(expires, jiffies)) {
>   		unsigned long jiffies_now = jiffies;
>   		unsigned long msecs = jiffies_to_msecs(jiffies_now) - jiffies_to_msecs(s->jiffies_next);
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;
> @@ -460,6 +466,7 @@ static int msi3101_convert_stream_252(struct msi3101_state *s, u8 *dst,
>   {
>   	int i, i_max, dst_len = 0;
>   	u32 sample_num[3];
> +	unsigned long expires;
>
>   	/* There could be 1-3 1024 bytes URB frames */
>   	i_max = src_len / 1024;
> @@ -488,7 +495,8 @@ static int msi3101_convert_stream_252(struct msi3101_state *s, u8 *dst,
>   	}
>
>   	/* calculate samping rate and output it in 10 seconds intervals */
> -	if ((s->jiffies_next + msecs_to_jiffies(10000)) <= jiffies) {
> +	expires = s->jiffies_next + msecs_to_jiffies(10000);
> +	if (time_before_eq(expires, jiffies)) {
>   		unsigned long jiffies_now = jiffies;
>   		unsigned long msecs = jiffies_to_msecs(jiffies_now) - jiffies_to_msecs(s->jiffies_next);
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;

--
http://palosaari.fi/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/