From: Stefan Hajnoczi <stefanha@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, famz@redhat.com, qemu-block@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 09/10] scsi: add multipath support to qemu-pr-helper
Date: Wed, 30 Aug 2017 17:37:50 +0100 [thread overview]
Message-ID: <20170830163750.GY24565@stefanha-x1.localdomain> (raw)
In-Reply-To: <20170822131832.20191-10-pbonzini@redhat.com>
On Tue, Aug 22, 2017 at 03:18:31PM +0200, Paolo Bonzini wrote:
> +static int multipath_pr_in(int fd, const uint8_t *cdb, uint8_t *sense,
> + uint8_t *data, int sz)
> +{
> + int rq_servact = cdb[1];
> + struct prin_resp resp;
> + size_t written;
> + int r;
> +
> + switch (rq_servact) {
> + case MPATH_PRIN_RKEY_SA:
> + case MPATH_PRIN_RRES_SA:
> + case MPATH_PRIN_RCAP_SA:
> + break;
> + case MPATH_PRIN_RFSTAT_SA:
> + /* Nobody implements it anyway, so bail out. */
> + default:
> + /* Cannot parse any other output. */
> + scsi_build_sense(sense, SENSE_CODE(INVALID_FIELD));
> + return CHECK_CONDITION;
> + }
> +
> + r = mpath_persistent_reserve_in(fd, rq_servact, &resp, noisy, verbose);
> + if (r == MPATH_PR_SUCCESS) {
> + switch (rq_servact) {
The case statements asssume sz has a certain minimum value. I didn't
see a check anywhere that guarantees this. It may be easier to hide the
client's sz value and instead use sizeof(client->data). The caller can
worry about sz.
> + case MPATH_PRIN_RKEY_SA:
> + case MPATH_PRIN_RRES_SA: {
> + struct prin_readdescr *out = &resp.prin_descriptor.prin_readkeys;
> + stl_be_p(&data[0], out->prgeneration);
> + stl_be_p(&data[4], out->additional_length);
> + memcpy(&data[8], out->key_list, MIN(out->additional_length, sz - 8));
sz < 8 is possible, please handle this case.
> + written = MIN(out->additional_length + 8, sz);
> + break;
> + }
> + case MPATH_PRIN_RCAP_SA: {
> + struct prin_capdescr *out = &resp.prin_descriptor.prin_readcap;
> + stw_be_p(&data[0], out->length);
> + data[2] = out->flags[0];
> + data[3] = out->flags[1];
> + stw_be_p(&data[4], out->pr_type_mask);
> + written = MIN(6, sz);
> + break;
> + }
> + default:
> + scsi_build_sense(sense, SENSE_CODE(INVALID_OPCODE));
> + return CHECK_CONDITION;
> + }
> + assert(written < sz);
Why is written == sz not allowed?
> + memset(data + written, 0, sz - written);
> + }
> +
> + return mpath_reconstruct_sense(fd, r, sense);
> +}
> +
> +static int multipath_pr_out(int fd, const uint8_t *cdb, uint8_t *sense,
> + const uint8_t *param, int sz)
> +{
> + int rq_servact = cdb[1];
> + int rq_scope = cdb[2] >> 4;
> + int rq_type = cdb[2] & 0xf;
> + struct prout_param_descriptor paramp;
> + char transportids[PR_HELPER_DATA_SIZE];
> + int r;
> + int i, j;
> +
> + switch (rq_servact) {
> + case MPATH_PROUT_REG_SA:
> + case MPATH_PROUT_RES_SA:
> + case MPATH_PROUT_REL_SA:
> + case MPATH_PROUT_CLEAR_SA:
> + case MPATH_PROUT_PREE_SA:
> + case MPATH_PROUT_PREE_AB_SA:
> + case MPATH_PROUT_REG_IGN_SA:
> + case MPATH_PROUT_REG_MOV_SA:
> + break;
> + default:
> + /* Cannot parse any other input. */
> + scsi_build_sense(sense, SENSE_CODE(INVALID_FIELD));
> + return CHECK_CONDITION;
> + }
> +
> + /* Convert input data, especially transport IDs, to the structs
> + * used by libmpathpersist (which, of course, will immediately
> + * do the opposite).
> + */
> + memset(¶mp, 0, sizeof(paramp));
> + memcpy(¶mp.key, ¶m[0], 8);
> + memcpy(¶mp.sa_key, ¶m[8], 8);
> + paramp.sa_flags = param[10];
> + for (i = PR_OUT_FIXED_PARAM_SIZE, j = 0; i < sz; ) {
> + struct transportid *id = (struct transportid *) &transportids[j];
> + int len;
> +
> + id->format_code = param[i] & 0xc0;
> + id->protocol_id = param[i] & 0x0f;
> + switch (param[i] & 0xcf) {
At this point we know sz > PR_OUT_FIXED_PARAM_SIZE && i < sz. I think
the following case statements can read beyond the end of client->data[]
because nothing checks sz before accessing param[].
Missing sz checks?
> + case 0:
> + /* FC transport. */
> + memcpy(id->n_port_name, ¶m[i + 8], 8);
> + j += offsetof(struct transportid, n_port_name[8]);
> + i += 24;
> + break;
> + case 3:
> + case 0x43:
> + /* iSCSI transport. */
> + len = lduw_be_p(¶m[i + 2]);
> + if (len > 252 || (len & 3)) {
int len can be negative here :(. Please use the size_t type - it's
unsigned and used by memchr(3)/memcpy(3).
next prev parent reply other threads:[~2017-08-30 16:38 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 13:18 [Qemu-devel] [RFC PATCH 00/10] scsi, block: introduce persistent reservation managers Paolo Bonzini
2017-08-22 13:18 ` [Qemu-devel] [PATCH 01/10] scsi: rename scsi_convert_sense Paolo Bonzini
2017-08-22 13:38 ` Philippe Mathieu-Daudé
2017-08-22 13:18 ` [Qemu-devel] [PATCH 02/10] scsi: move non-emulation specific code to scsi/ Paolo Bonzini
2017-08-22 13:34 ` Philippe Mathieu-Daudé
2017-08-22 13:18 ` [Qemu-devel] [PATCH 03/10] scsi: introduce scsi_build_sense Paolo Bonzini
2017-08-22 13:35 ` Philippe Mathieu-Daudé
2017-08-30 13:39 ` Stefan Hajnoczi
2017-08-22 13:18 ` [Qemu-devel] [PATCH 04/10] scsi: introduce sg_io_sense_from_errno Paolo Bonzini
2017-08-22 13:45 ` Philippe Mathieu-Daudé
2017-08-22 13:53 ` Paolo Bonzini
2017-08-30 13:41 ` Stefan Hajnoczi
2017-08-22 13:18 ` [Qemu-devel] [PATCH 05/10] scsi: move block/scsi.h to include/scsi/constants.h Paolo Bonzini
2017-08-22 13:37 ` Philippe Mathieu-Daudé
2017-08-30 13:41 ` Stefan Hajnoczi
2017-08-22 13:18 ` [Qemu-devel] [PATCH 06/10] scsi, file-posix: add support for persistent reservation management Paolo Bonzini
2017-08-23 4:13 ` Fam Zheng
2017-08-23 6:56 ` Paolo Bonzini
2017-08-24 15:37 ` Eric Blake
2017-08-24 15:47 ` Paolo Bonzini
2017-08-30 12:59 ` Daniel P. Berrange
2017-08-30 14:26 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2017-08-22 13:18 ` [Qemu-devel] [PATCH 07/10] io: add qio_channel_read/write_all Paolo Bonzini
2017-08-23 5:08 ` Fam Zheng
2017-08-23 6:54 ` Paolo Bonzini
2017-08-30 12:52 ` Daniel P. Berrange
2017-08-30 14:33 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2017-08-22 13:18 ` [Qemu-devel] [PATCH 08/10] scsi: build qemu-pr-helper Paolo Bonzini
2017-08-22 14:34 ` Marc-André Lureau
2017-08-22 16:04 ` Paolo Bonzini
2017-08-24 15:45 ` Eric Blake
2017-08-30 15:44 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2017-08-30 16:06 ` Stefan Hajnoczi
2017-08-22 13:18 ` [Qemu-devel] [PATCH 09/10] scsi: add multipath support to qemu-pr-helper Paolo Bonzini
2017-08-23 5:01 ` Fam Zheng
2017-08-23 6:50 ` Paolo Bonzini
2017-08-30 16:06 ` Stefan Hajnoczi
2017-08-30 16:37 ` Stefan Hajnoczi [this message]
2017-09-11 9:14 ` [Qemu-devel] [Qemu-block] " Paolo Bonzini
2017-08-22 13:18 ` [Qemu-devel] [PATCH 10/10] scsi: add persistent reservation manager using qemu-pr-helper Paolo Bonzini
2017-08-23 4:49 ` Fam Zheng
2017-08-23 6:55 ` Paolo Bonzini
2017-08-23 7:48 ` Paolo Bonzini
2017-08-30 16:58 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2017-08-22 13:48 ` [Qemu-devel] [RFC PATCH 00/10] scsi, block: introduce persistent reservation managers no-reply
2017-08-22 13:50 ` no-reply
2017-08-22 13:50 ` no-reply
2017-08-22 13:51 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170830163750.GY24565@stefanha-x1.localdomain \
--to=stefanha@gmail.com \
--cc=famz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).