Edit

IABSD.fr/src/usr.sbin/installboot/sparc64_softraid.c

Branch :

  • Show log

    Commit

  • Author : kn
    Date : 2020-06-08 19:17:12
    Hash : 9de342e3
    Message : Provide clear errors when trying to install oversized boot loader sparc64 installboot(8) on softraid(4) with too large files, e.g. unstripped builds, fails poorly with "installboot: softraid installboot failed". This is due to the BIOCINSTALLBOOT ioctl(2) returing the default EINVAL rather than using softraid's sr_error() interface properly; additionally, installboot does not check for such message from the bio(4) layer. Make the kernel generate "boot block too large" and "boot loader too large" messages for softraid devices and have installboot act upon them analogous to bioctl(8), by adapting its bio_status() into the new sr_status() helper. Input, reminder to look at bioctl, same kernel diff from, OK jsing

  • usr.sbin/installboot/sparc64_softraid.c
  • /*	$OpenBSD: sparc64_softraid.c,v 1.5 2020/06/08 19:17:12 kn Exp $	*/
    /*
     * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
     *
     * Permission to use, copy, modify, and distribute this software for any
     * purpose with or without fee is hereby granted, provided that the above
     * copyright notice and this permission notice appear in all copies.
     *
     * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
     * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
     * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
     * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
     * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
     * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
     * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     */
    
    #include <sys/types.h>
    #include <sys/disklabel.h>
    #include <sys/ioctl.h>
    #include <sys/stat.h>
    
    #include <dev/biovar.h>
    #include <dev/softraidvar.h>
    
    #include <err.h>
    #include <fcntl.h>
    #include <stdio.h>
    #include <string.h>
    #include <util.h>
    #include <unistd.h>
    
    #include "installboot.h"
    #include "sparc64_installboot.h"
    
    void
    sr_install_bootblk(int devfd, int vol, int disk)
    {
    	struct bioc_disk bd;
    	char *realdev;
    	int diskfd;
    	char part;
    
    	/* Get device name for this disk/chunk. */
    	memset(&bd, 0, sizeof(bd));
    	bd.bd_volid = vol;
    	bd.bd_diskid = disk;
    	if (ioctl(devfd, BIOCDISK, &bd) == -1)
    		err(1, "BIOCDISK");
    
    	/* Check disk status. */
    	if (bd.bd_status != BIOC_SDONLINE && bd.bd_status != BIOC_SDREBUILD) {
    		fprintf(stderr, "softraid chunk %u not online - skipping...\n",
    		    disk);
    		return;
    	}
    
    	if (strlen(bd.bd_vendor) < 1)
    		errx(1, "invalid disk name");
    	part = bd.bd_vendor[strlen(bd.bd_vendor) - 1];
    	if (part < 'a' || part >= 'a' + MAXPARTITIONS)
    		errx(1, "invalid partition %c\n", part);
    	bd.bd_vendor[strlen(bd.bd_vendor) - 1] = '\0';
    
    	/* Open device. */
    	if ((diskfd = opendev(bd.bd_vendor, (nowrite ? O_RDONLY : O_RDWR),
    	    OPENDEV_PART, &realdev)) == -1)
    		err(1, "open: %s", realdev);
    
    	if (verbose)
    		fprintf(stderr, "%s%c: installing boot blocks on %s\n",
    		    bd.bd_vendor, part, realdev);
    
    	/* Write boot blocks to device. */
    	md_installboot(diskfd, realdev);
    
    	close(diskfd);
    }
    
    void
    sr_install_bootldr(int devfd, char *dev)
    {
    	struct bioc_installboot bb;
    
    	/*
    	 * Install boot loader into softraid boot loader storage area.
    	 */
    	memset(&bb, 0, sizeof(bb));
    	bb.bb_bootblk = blkstore;
    	bb.bb_bootblk_size = blksize;
    	bb.bb_bootldr = ldrstore;
    	bb.bb_bootldr_size = ldrsize;
    	strncpy(bb.bb_dev, dev, sizeof(bb.bb_dev));
    	if (!nowrite) {
    		if (verbose)
    			fprintf(stderr, "%s: installing boot loader on "
    			    "softraid volume\n", dev);
    		if (ioctl(devfd, BIOCINSTALLBOOT, &bb) == -1)
    			errx(1, "softraid installboot failed");
    		sr_status(&bb.bb_bio.bio_status);
    	}
    }