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

Commit 18d74871 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Fix to check only reset IPA stats can have data as NULL"

parents 375a78ac 20e37341

drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2652,8 +2652,9 @@ int rmnet_ipa_query_tethering_stats(struct wan_ioctl_query_tether_stats *data, 
		/* prevent string buffer overflows */

		data->upstreamIface[IFNAMSIZ-1] = '\0';

		data->tetherIface[IFNAMSIZ-1] = '\0';

	} else if (reset != false) {

		/* Data can be NULL for reset stats, checking reset != False */

	} else if (reset == false) {

		/* only reset can have data == NULL*/

		IPAWANERR("query without allocate tether_stats strucutre\n");

		return -EINVAL;

	}

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2810,8 +2810,9 @@ int rmnet_ipa3_query_tethering_stats(struct wan_ioctl_query_tether_stats *data, 
		/* prevent string buffer overflows */

		data->upstreamIface[IFNAMSIZ-1] = '\0';

		data->tetherIface[IFNAMSIZ-1] = '\0';

	} else if (reset != false) {

		/* Data can be NULL for reset stats, checking reset != False */

	} else if (reset == false) {

		/* only reset can have data == NULL */

		IPAWANERR("query without allocate tether_stats strucutre\n");

		return -EINVAL;

	}