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

Commit 77aa22b8 authored by Michael Bestas's avatar Michael Bestas Committed by Dyneteve
Browse files

Revert "msm: ipa: fix security issues in ipa wan driver" 

* Will be replaced with more complete fix from upstream

This reverts commit eef1f3d04706192f2f2f8ae27ce4f0af6488e0a5.
parent 24f5d529

drivers/platform/msm/ipa/rmnet_ipa.c

+0 −7
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static atomic_t is_initialized; 
static atomic_t is_ssr;



u32 apps_to_ipa_hdl, ipa_to_apps_hdl; /* get handler from ipa */

static struct mutex add_mux_channel_lock;

static int wwan_add_ul_flt_rule_to_ipa(void);

static int wwan_del_ul_flt_rule_to_ipa(void);
@@ -1227,11 +1226,9 @@ static int ipa_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
					rmnet_mux_val.mux_id);

				return rc;

			}

			mutex_lock(&add_mux_channel_lock);

			if (rmnet_index >= MAX_NUM_OF_MUX_CHANNEL) {

				IPAWANERR("Exceed mux_channel limit(%d)\n",

				rmnet_index);

				mutex_unlock(&add_mux_channel_lock);

				return -EFAULT;

			}

			IPAWANDBG("ADD_MUX_CHANNEL(%d, name: %s)\n",
@@ -1259,7 +1256,6 @@ static int ipa_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
					IPAWANERR("device %s reg IPA failed\n",

						extend_ioctl_data.u.

						rmnet_mux_val.vchannel_name);

					mutex_unlock(&add_mux_channel_lock);

					return -ENODEV;

				}

				mux_channel[rmnet_index].mux_channel_set = true;
@@ -1272,7 +1268,6 @@ static int ipa_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
				mux_channel[rmnet_index].ul_flt_reg = false;

			}

			rmnet_index++;

			mutex_unlock(&add_mux_channel_lock);

			break;

		case RMNET_IOCTL_SET_EGRESS_DATA_FORMAT:

			IPAWANDBG("get RMNET_IOCTL_SET_EGRESS_DATA_FORMAT\n");
@@ -1951,7 +1946,6 @@ static int __init ipa_wwan_init(void) 
	if (!ipa_ssr_workqueue)

		return -ENOMEM;



	mutex_init(&add_mux_channel_lock);

	subsys = subsys_notif_register_notifier(SUBSYS_MODEM, &ssr_notifier);

	if (!IS_ERR(subsys)) {

		return platform_driver_register(&rmnet_ipa_driver);
@@ -1963,7 +1957,6 @@ static int __init ipa_wwan_init(void) 


static void __exit ipa_wwan_cleanup(void)

{

	mutex_destroy(&add_mux_channel_lock);

	platform_driver_unregister(&rmnet_ipa_driver);

}