| Message ID | 20220413204742.5539-6-parri.andrea@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hv_sock: Hardening changes | expand |
From: Andrea Parri (Microsoft) <parri.andrea@gmail.com> Sent: Wednesday, April 13, 2022 1:48 PM > > So that isolated guests can communicate with the host via hv_sock > channels. > > Signed-off-by: Andrea Parri (Microsoft) <parri.andrea@gmail.com> > --- > drivers/hv/channel_mgmt.c | 9 +++++++-- > include/linux/hyperv.h | 8 ++++++-- > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c > index 67be81208a2d9..83d7ab90b7305 100644 > --- a/drivers/hv/channel_mgmt.c > +++ b/drivers/hv/channel_mgmt.c > @@ -976,17 +976,22 @@ find_primary_channel_by_offer(const struct > vmbus_channel_offer_channel *offer) > return channel; > } > > -static bool vmbus_is_valid_device(const guid_t *guid) > +static bool vmbus_is_valid_offer(const struct vmbus_channel_offer_channel *offer) > { > + const guid_t *guid = &offer->offer.if_type; > u16 i; > > if (!hv_is_isolation_supported()) > return true; > > + if (is_hvsock_offer(offer)) > + return true; > + > for (i = 0; i < ARRAY_SIZE(vmbus_devs); i++) { > if (guid_equal(guid, &vmbus_devs[i].guid)) > return vmbus_devs[i].allowed_in_isolated; > } > + Spurious newline added? > return false; > } > > @@ -1004,7 +1009,7 @@ static void vmbus_onoffer(struct > vmbus_channel_message_header *hdr) > > trace_vmbus_onoffer(offer); > > - if (!vmbus_is_valid_device(&offer->offer.if_type)) { > + if (!vmbus_is_valid_offer(offer)) { > pr_err_ratelimited("Invalid offer %d from the host supporting isolation\n", > offer->child_relid); > atomic_dec(&vmbus_connection.offer_in_progress); > diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h > index 55478a6810b60..1112c5cf894e6 100644 > --- a/include/linux/hyperv.h > +++ b/include/linux/hyperv.h > @@ -1044,10 +1044,14 @@ struct vmbus_channel { > u64 vmbus_next_request_id(struct vmbus_channel *channel, u64 rqst_addr); > u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id); > > +static inline bool is_hvsock_offer(const struct vmbus_channel_offer_channel *o) > +{ > + return !!(o->offer.chn_flags & VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER); > +} > + > static inline bool is_hvsock_channel(const struct vmbus_channel *c) > { > - return !!(c->offermsg.offer.chn_flags & > - VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER); > + return is_hvsock_offer(&c->offermsg); > } > > static inline bool is_sub_channel(const struct vmbus_channel *c) > -- > 2.25.1
> > @@ -976,17 +976,22 @@ find_primary_channel_by_offer(const struct > > vmbus_channel_offer_channel *offer) > > return channel; > > } > > > > -static bool vmbus_is_valid_device(const guid_t *guid) > > +static bool vmbus_is_valid_offer(const struct vmbus_channel_offer_channel *offer) > > { > > + const guid_t *guid = &offer->offer.if_type; > > u16 i; > > > > if (!hv_is_isolation_supported()) > > return true; > > > > + if (is_hvsock_offer(offer)) > > + return true; > > + > > for (i = 0; i < ARRAY_SIZE(vmbus_devs); i++) { > > if (guid_equal(guid, &vmbus_devs[i].guid)) > > return vmbus_devs[i].allowed_in_isolated; > > } > > + > > Spurious newline added? > > > return false; Intentionally added to visually separate the "hvsock", "vmbus_dev" and "default" blocks, patch seemed simple enough to try to merge in "style material" without incurring in the question. ;-) Newline removed. Thanks, Andrea
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c index 67be81208a2d9..83d7ab90b7305 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c @@ -976,17 +976,22 @@ find_primary_channel_by_offer(const struct vmbus_channel_offer_channel *offer) return channel; } -static bool vmbus_is_valid_device(const guid_t *guid) +static bool vmbus_is_valid_offer(const struct vmbus_channel_offer_channel *offer) { + const guid_t *guid = &offer->offer.if_type; u16 i; if (!hv_is_isolation_supported()) return true; + if (is_hvsock_offer(offer)) + return true; + for (i = 0; i < ARRAY_SIZE(vmbus_devs); i++) { if (guid_equal(guid, &vmbus_devs[i].guid)) return vmbus_devs[i].allowed_in_isolated; } + return false; } @@ -1004,7 +1009,7 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr) trace_vmbus_onoffer(offer); - if (!vmbus_is_valid_device(&offer->offer.if_type)) { + if (!vmbus_is_valid_offer(offer)) { pr_err_ratelimited("Invalid offer %d from the host supporting isolation\n", offer->child_relid); atomic_dec(&vmbus_connection.offer_in_progress); diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 55478a6810b60..1112c5cf894e6 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1044,10 +1044,14 @@ struct vmbus_channel { u64 vmbus_next_request_id(struct vmbus_channel *channel, u64 rqst_addr); u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id); +static inline bool is_hvsock_offer(const struct vmbus_channel_offer_channel *o) +{ + return !!(o->offer.chn_flags & VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER); +} + static inline bool is_hvsock_channel(const struct vmbus_channel *c) { - return !!(c->offermsg.offer.chn_flags & - VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER); + return is_hvsock_offer(&c->offermsg); } static inline bool is_sub_channel(const struct vmbus_channel *c)
So that isolated guests can communicate with the host via hv_sock channels. Signed-off-by: Andrea Parri (Microsoft) <parri.andrea@gmail.com> --- drivers/hv/channel_mgmt.c | 9 +++++++-- include/linux/hyperv.h | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-)