search for: 964,7

...inline int xfer_kern(void *src, void *dst, size_t len) return 0; } +static inline int kern_xfer(void *dst, void *src, size_t len) +{ + memcpy(dst, src, len); + return 0; +} + /** * vringh_init_kern - initialize a vringh for a kernelspace vring. * @vrh: the vringh to initialize. @@ -958,7 +964,7 @@ EXPORT_SYMBOL(vringh_iov_pull_kern); ssize_t vringh_iov_push_kern(struct vringh_kiov *wiov, const void *src, size_t len) { - return vringh_iov_xfer(wiov, (void *)src, len, xfer_kern); + return vringh_iov_xfer(wiov, (void *)src, len, kern_xfer); } EXPORT_SYMBOL(vringh_iov_push_kern...

...inline int xfer_kern(void *src, void *dst, size_t len) return 0; } +static inline int kern_xfer(void *dst, void *src, size_t len) +{ + memcpy(dst, src, len); + return 0; +} + /** * vringh_init_kern - initialize a vringh for a kernelspace vring. * @vrh: the vringh to initialize. @@ -958,7 +964,7 @@ EXPORT_SYMBOL(vringh_iov_pull_kern); ssize_t vringh_iov_push_kern(struct vringh_kiov *wiov, const void *src, size_t len) { - return vringh_iov_xfer(wiov, (void *)src, len, xfer_kern); + return vringh_iov_xfer(wiov, (void *)src, len, kern_xfer); } EXPORT_SYMBOL(vringh_iov_push_kern...

...har * -analyze_line (char *line, char **key, char **value) +analyze_line (char *line, char **key, char **value, char delim) { char *p = line; char *next = NULL; - char delimiter = ':'; + char delimiter = delim; char *del_pos = NULL; if (!line || *line == '\0') { @@ -964,7 +964,7 @@ do_btrfs_subvolume_show (const char *subvolume) * snapshots/test3 * */ - p = analyze_line(out, &key, &value); + p = analyze_line(out, &key, &value, ':'); if (!p) { reply_with_error ("truncated output: %s&...

...urn 0; > } > > +static inline int kern_xfer(void *dst, void *src, size_t len) > +{ > + memcpy(dst, src, len); > + return 0; > +} > + > /** > * vringh_init_kern - initialize a vringh for a kernelspace vring. > * @vrh: the vringh to initialize. > @@ -958,7 +964,7 @@ EXPORT_SYMBOL(vringh_iov_pull_kern); > ssize_t vringh_iov_push_kern(struct vringh_kiov *wiov, > const void *src, size_t len) > { > - return vringh_iov_xfer(wiov, (void *)src, len, xfer_kern); > + return vringh_iov_xfer(wiov, (void *)src, len, kern_xfer); > } >...

...on this patch? > --- > drivers/vhost/scsi.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c > index 76f8d649147b..cbe0ea26c1ff 100644 > --- a/drivers/vhost/scsi.c > +++ b/drivers/vhost/scsi.c > @@ -964,7 +964,8 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) > prot_bytes = vhost32_to_cpu(vq, v_req_pi.pi_bytesin); > } > /* > - * Set prot_iter to data_iter, and advance past any > + * Set prot_iter to data_iter and truncate it to > +...

...urn 0; > } > > +static inline int kern_xfer(void *dst, void *src, size_t len) > +{ > + memcpy(dst, src, len); > + return 0; > +} > + > /** > * vringh_init_kern - initialize a vringh for a kernelspace vring. > * @vrh: the vringh to initialize. > @@ -958,7 +964,7 @@ EXPORT_SYMBOL(vringh_iov_pull_kern); > ssize_t vringh_iov_push_kern(struct vringh_kiov *wiov, > const void *src, size_t len) > { > - return vringh_iov_xfer(wiov, (void *)src, len, xfer_kern); > + return vringh_iov_xfer(wiov, (void *)src, len, kern_xfer); > } >...

...wing \n. */ static char * -analyze_line (char *line, char **key, char **value) +analyze_line (char *line, char **key, char **value, char delimiter) { char *p = line; char *next = NULL; - char delimiter = ':'; char *del_pos = NULL; if (!line || *line == '\0') { @@ -964,7 +963,7 @@ do_btrfs_subvolume_show (const char *subvolume) * snapshots/test3 * */ - p = analyze_line(out, &key, &value); + p = analyze_line(out, &key, &value, ':'); if (!p) { reply_with_error ("truncated output: %s&...

...wing \n. */ static char * -analyze_line (char *line, char **key, char **value) +analyze_line (char *line, char **key, char **value, char delimiter) { char *p = line; char *next = NULL; - char delimiter = ':'; char *del_pos = NULL; if (!line || *line == '\0') { @@ -964,7 +963,7 @@ do_btrfs_subvolume_show (const char *subvolume) * snapshots/test3 * */ - p = analyze_line(out, &key, &value); + p = analyze_line(out, &key, &value, ':'); if (!p) { reply_with_error ("truncated output: %s&...

...{ > char *p = line; > char *next = NULL; > - char delimiter = ':'; > + char delimiter = delim; > char *del_pos = NULL; > > if (!line || *line == '\0') { Why keep the local variable 'delimiter'? Just name the argument like that. > @@ -964,7 +964,7 @@ do_btrfs_subvolume_show (const char *subvolume) > * snapshots/test3 > * > */ > - p = analyze_line(out, &key, &value); > + p = analyze_line(out, &key, &value, ':'); > if (!p) { > reply_with...

...) + if ((cert && (r = sshca_write(key, f)) == 0)) + success = 1; + else if ((r = sshkey_write(key, f) == 0)) success = 1; else error_fr(r, "sshkey_write"); diff --git a/sshconnect.c b/sshconnect.c index 7cf6b6386..72bdc7d1f 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -964,7 +964,7 @@ check_host_key(char *hostname, const struct ssh_conn_info *cinfo, HostStatus host_status = -1, ip_status = -1; struct sshkey *raw_key = NULL; char *ip = NULL, *host = NULL; - char hostline[1000], *hostp, *fp, *ra; + char hostline[1000], *hostp, *fp, *cafp, *ra; char msg[1024];...

...t; + char delimiter = delim; >> char *del_pos = NULL; >> >> if (!line || *line == '\0') { > > Why keep the local variable 'delimiter'? Just name the argument like > that. I thought it is a good coding rule. OK, will remove the local >> @@ -964,7 +964,7 @@ do_btrfs_subvolume_show (const char *subvolume) >> * snapshots/test3 >> * >> */ >> - p = analyze_line(out, &key, &value); >> + p = analyze_line(out, &key, &value, ':'); >> if...

...nouveau/dispnv50/disp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 0f7d72518604..982054bbcc8b 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -964,7 +964,11 @@ static void nv50_mstc_destroy(struct drm_connector *connector) { struct nv50_mstc *mstc = nv50_mstc(connector); + drm_connector_cleanup(&mstc->connector); + if (mstc->port) + drm_dp_mst_put_port_malloc(mstc->port); + kfree(mstc); } @@ -1012,6 +1016,7 @@ nv50_ms...

...@@ nv50_mstc_detect(struct drm_connector *connector, bool force) enum drm_connector_status conn_status; int ret; - if (!mstc->port) + if (drm_connector_is_unregistered(connector)) return connector_status_disconnected; ret = pm_runtime_get_sync(connector->dev->dev); @@ -966,8 +964,7 @@ nv50_mstc_destroy(struct drm_connector *connector) struct nv50_mstc *mstc = nv50_mstc(connector); drm_connector_cleanup(&mstc->connector); - if (mstc->port) - drm_dp_mst_put_port_malloc(mstc->port); + drm_dp_mst_put_port_malloc(mstc->port); kfree(mstc); } @@ -1081,1...

...inline int xfer_kern(void *src, void *dst, size_t len) return 0; } +static inline int kern_xfer(void *dst, void *src, size_t len) +{ + memcpy(dst, src, len); + return 0; +} + /** * vringh_init_kern - initialize a vringh for a kernelspace vring. * @vrh: the vringh to initialize. @@ -958,7 +964,7 @@ EXPORT_SYMBOL(vringh_iov_pull_kern); ssize_t vringh_iov_push_kern(struct vringh_kiov *wiov, const void *src, size_t len) { - return vringh_iov_xfer(wiov, (void *)src, len, xfer_kern); + return vringh_iov_xfer(wiov, (void *)src, len, kern_xfer); } EXPORT_SYMBOL(vringh_iov_push_kern...

...kern_xfer(void *dst, void *src, size_t len) > > +{ > > + memcpy(dst, src, len); > > + return 0; > > +} > > + > > /** > > * vringh_init_kern - initialize a vringh for a kernelspace vring. > > * @vrh: the vringh to initialize. > > @@ -958,7 +964,7 @@ EXPORT_SYMBOL(vringh_iov_pull_kern); > > ssize_t vringh_iov_push_kern(struct vringh_kiov *wiov, > > const void *src, size_t len) > > { > > - return vringh_iov_xfer(wiov, (void *)src, len, xfer_kern); > > + return vringh_iov_xfer(wiov, (void *)src, len,...

...urn 0; > } > > +static inline int kern_xfer(void *dst, void *src, size_t len) > +{ > + memcpy(dst, src, len); > + return 0; > +} > + > /** > * vringh_init_kern - initialize a vringh for a kernelspace vring. > * @vrh: the vringh to initialize. > @@ -958,7 +964,7 @@ EXPORT_SYMBOL(vringh_iov_pull_kern); > ssize_t vringh_iov_push_kern(struct vringh_kiov *wiov, > const void *src, size_t len) > { > - return vringh_iov_xfer(wiov, (void *)src, len, xfer_kern); > + return vringh_iov_xfer(wiov, (void *)src, len, kern_xfer); > } >...

...har *line, char **key, char **value) > +analyze_line (char *line, char **key, char **value, char delimiter) > { > char *p = line; > char *next = NULL; > - char delimiter = ':'; > char *del_pos = NULL; > > if (!line || *line == '\0') { > @@ -964,7 +963,7 @@ do_btrfs_subvolume_show (const char *subvolume) > * snapshots/test3 > * > */ > - p = analyze_line(out, &key, &value); > + p = analyze_line(out, &key, &value, ':'); > if (!p) { > reply_with...

...the existence of processes owned by other users. Fix B assumes that, when your parent exits, you get re-parented to pid 1 and the result from getppid() changes. I have tested this and it works for me. I append a patch. --apb (Alan Barrett) Index: ssh-agent.c --- ssh-agent.c +++ ssh-agent.c @@ -964,7 +964,13 @@ { int save_errno = errno; - if (parent_pid != -1 && kill(parent_pid, 0) < 0) { + /* + * Don't just test whether kill(parent_pid,0) is successful, + * because it may fail with EPERM even if the process exists. + * If our parent has exited then getppid() will retur...

...> > > +{ > > > + memcpy(dst, src, len); > > > + return 0; > > > +} > > > + > > > /** > > > * vringh_init_kern - initialize a vringh for a kernelspace vring. > > > * @vrh: the vringh to initialize. > > > @@ -958,7 +964,7 @@ EXPORT_SYMBOL(vringh_iov_pull_kern); > > > ssize_t vringh_iov_push_kern(struct vringh_kiov *wiov, > > > const void *src, size_t len) > > > { > > > - return vringh_iov_xfer(wiov, (void *)src, len, xfer_kern); > > > + return vringh_iov_xfer...

...@@ -954,7 +955,7 @@ unsigned vhost_get_vq_desc(struct vhost_dev *dev, struct vhost_virtqueue *vq, if (ret < 0) { vq_err(vq, "Failure detected " "in indirect descriptor at idx %d\n", i); - return vq->num; + return ret; } continue; } @@ -964,7 +965,7 @@ unsigned vhost_get_vq_desc(struct vhost_dev *dev, struct vhost_virtqueue *vq, if (ret < 0) { vq_err(vq, "Translation failure %d descriptor idx %d\n", ret, i); - return vq->num; + return ret; } if (desc.flags & VRING_DESC_F_WRITE) { /*...